- More texture optimizations.

cube/swiss/source/devices/fat/deviceHandler-FAT.c

@@ -565,7 +565,7 @@ DEVICEHANDLER_INTERFACE __device_ata_a = {
 	.hwName = "IDE-EXI",
 	.deviceName = "IDE-EXI - Slot A",
 	.deviceDescription = "IDE/PATA HDD - Supported File System(s): FAT16, FAT32, exFAT",
-	.deviceTexture = {TEX_HDD, 104, 73, 112, 80},
+	.deviceTexture = {TEX_HDD, 104, 73, 104, 76},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_THREAD_SAFE|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	.emulable = EMU_READ|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	.location = LOC_MEMCARD_SLOT_A,
@@ -592,7 +592,7 @@ DEVICEHANDLER_INTERFACE __device_ata_b = {
 	.hwName = "IDE-EXI",
 	.deviceName = "IDE-EXI - Slot B",
 	.deviceDescription = "IDE/PATA HDD - Supported File System(s): FAT16, FAT32, exFAT",
-	.deviceTexture = {TEX_HDD, 104, 73, 112, 80},
+	.deviceTexture = {TEX_HDD, 104, 73, 104, 76},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_THREAD_SAFE|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	.emulable = EMU_READ|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	.location = LOC_MEMCARD_SLOT_B,
@@ -646,7 +646,7 @@ DEVICEHANDLER_INTERFACE __device_ata_c = {
 	.hwName = "M.2 Loader",
 	.deviceName = "M.2 Loader",
 	.deviceDescription = "M.2 SATA SSD - Supported File System(s): FAT16, FAT32, exFAT",
-	.deviceTexture = {TEX_M2LOADER, 112, 54, 120, 64},
+	.deviceTexture = {TEX_M2LOADER, 112, 54, 112, 56},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_CONFIG_DEVICE|FEAT_AUTOLOAD_DOL|FEAT_THREAD_SAFE|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	.emulable = EMU_READ|EMU_READ_SPEED|EMU_AUDIO_STREAMING|EMU_MEMCARD,
 	.location = LOC_SERIAL_PORT_1,

cube/swiss/source/devices/memcard/deviceHandler-CARD.c

@@ -549,7 +549,7 @@ DEVICEHANDLER_INTERFACE __device_card_a = {
 	.hwName = "Memory Card",
 	.deviceName = "Memory Card - Slot A",
 	.deviceDescription = "Backup & Restore save games",
-	.deviceTexture = {TEX_MEMCARD, 76, 84, 80, 88},
+	.deviceTexture = {TEX_MEMCARD, 76, 84, 80, 92},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_BOOT_DEVICE,
 	.location = LOC_MEMCARD_SLOT_A,
 	.initial = &initial_CARDA,
@@ -572,7 +572,7 @@ DEVICEHANDLER_INTERFACE __device_card_b = {
 	.hwName = "Memory Card",
 	.deviceName = "Memory Card - Slot B",
 	.deviceDescription = "Backup & Restore save games",
-	.deviceTexture = {TEX_MEMCARD, 76, 84, 80, 88},
+	.deviceTexture = {TEX_MEMCARD, 76, 84, 80, 92},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_BOOT_DEVICE,
 	.location = LOC_MEMCARD_SLOT_B,
 	.initial = &initial_CARDB,

cube/swiss/source/devices/qoob/deviceHandler-Qoob.c

@@ -430,7 +430,7 @@ DEVICEHANDLER_INTERFACE __device_qoob = {
 	.hwName = "Qoob Modchip",
 	.deviceName = "Qoob Pro",
 	.deviceDescription = "Qoob Pro Flash File System",
-	.deviceTexture = {TEX_QOOB, 82, 84, 88, 88},
+	.deviceTexture = {TEX_QOOB, 82, 84, 96, 102},
 	.features = FEAT_READ|FEAT_WRITE,
 	.location = LOC_SYSTEM,
 	.initial = &initial_Qoob,

cube/swiss/source/devices/usbgecko/deviceHandler-usbgecko.c

@@ -225,7 +225,7 @@ DEVICEHANDLER_INTERFACE __device_usbgecko = {
 	.hwName = "USB Gecko",
 	.deviceName = "USB Gecko - Slot B only",
 	.deviceDescription = "Requires PC application to be up",
-	.deviceTexture = {TEX_USBGECKO, 60, 84, 64, 88},
+	.deviceTexture = {TEX_USBGECKO, 60, 84, 64, 84},
 	.features = FEAT_READ|FEAT_BOOT_GCM|FEAT_HYPERVISOR,
 	.emulable = EMU_READ,
 	.location = LOC_MEMCARD_SLOT_B,

cube/swiss/source/devices/wode/deviceHandler-WODE.c

@@ -290,7 +290,7 @@ DEVICEHANDLER_INTERFACE __device_wode = {
 	.hwName = "WODE",
 	.deviceName = "WODE Jukebox",
 	.deviceDescription = "Supported File System(s): FAT32, NTFS, EXT2/3, HPFS",
-	.deviceTexture = {TEX_WODEIMG, 116, 40, 120, 48},
+	.deviceTexture = {TEX_WODEIMG, 116, 40, 120, 40},
 	.features = FEAT_READ|FEAT_BOOT_GCM|FEAT_BOOT_DEVICE|FEAT_HYPERVISOR,
 	.emulable = EMU_READ|EMU_MEMCARD,
 	.location = LOC_DVD_CONNECTOR,

cube/swiss/source/gui/FrameBufferMagic.c

@@ -44,11 +44,13 @@ GXTexObj hddTexObj;
 GXTlutObj hddTlutObj;
 GXTexObj qoobTexObj;
 GXTlutObj qoobTlutObj;
+GXTexObj qoobIndTexObj;
 GXTexObj wodeimgTexObj;
 GXTexObj usbgeckoTexObj;
 GXTlutObj usbgeckoTlutObj;
 GXTexObj memcardTexObj;
 GXTlutObj memcardTlutObj;
+GXTexObj memcardIndTexObj;
 GXTexObj sambaTexObj;
 GXTexObj wiikeyTexObj;
 GXTexObj systemTexObj;
@@ -322,7 +324,7 @@ static void init_textures()
 	TPL_GetTextureCI(&imagesTPL, backdrop, &backdropTexObj, &backdropTlutObj, GX_TLUT0);
 	GX_InitTexObjFilterMode(&backdropTexObj, GX_LINEAR, GX_NEAR);
 	GX_InitTexObjUserData(&backdropTexObj, &backdropTlutObj);
-	TPL_GetTexture(&imagesTPL, backdropind, &backdropIndTexObj);
+	TPL_GetTexture(&imagesTPL, backdrop_ind, &backdropIndTexObj);
 	GX_InitTexObjFilterMode(&backdropIndTexObj, GX_NEAR, GX_NEAR);
 	GX_InitTexObjUserData(&backdropIndTexObj, &backdropTexObj);
 	TPL_GetTexture(&imagesTPL, gcdvdsmall, &gcdvdsmallTexObj);
@@ -331,12 +333,18 @@ static void init_textures()
 	TPL_GetTextureCI(&imagesTPL, hdd, &hddTexObj, &hddTlutObj, GX_TLUT0);
 	GX_InitTexObjUserData(&hddTexObj, &hddTlutObj);
 	TPL_GetTextureCI(&imagesTPL, qoob, &qoobTexObj, &qoobTlutObj, GX_TLUT0);
+	GX_InitTexObjFilterMode(&qoobTexObj, GX_LINEAR, GX_NEAR);
 	GX_InitTexObjUserData(&qoobTexObj, &qoobTlutObj);
+	TPL_GetTexture(&imagesTPL, qoob_ind, &qoobIndTexObj);
+	GX_InitTexObjFilterMode(&qoobIndTexObj, GX_NEAR, GX_NEAR);
 	TPL_GetTexture(&imagesTPL, wodeimg, &wodeimgTexObj);
 	TPL_GetTexture(&imagesTPL, wiikeyimg, &wiikeyTexObj);
 	TPL_GetTexture(&imagesTPL, systemimg, &systemTexObj);
 	TPL_GetTextureCI(&imagesTPL, memcardimg, &memcardTexObj, &memcardTlutObj, GX_TLUT0);
+	GX_InitTexObjFilterMode(&memcardTexObj, GX_LINEAR, GX_NEAR);
 	GX_InitTexObjUserData(&memcardTexObj, &memcardTlutObj);
+	TPL_GetTexture(&imagesTPL, memcardimg_ind, &memcardIndTexObj);
+	GX_InitTexObjFilterMode(&memcardIndTexObj, GX_NEAR, GX_NEAR);
 	TPL_GetTextureCI(&imagesTPL, usbgeckoimg, &usbgeckoTexObj, &usbgeckoTlutObj, GX_TLUT0);
 	GX_InitTexObjUserData(&usbgeckoTexObj, &usbgeckoTlutObj);
 	TPL_GetTexture(&imagesTPL, sambaimg, &sambaTexObj);
@@ -386,7 +394,7 @@ static void drawInit()
 	guOrtho(GXprojection2D, 0, 480, 0, 640, 0, 1);
 	GX_LoadProjectionMtx(GXprojection2D, GX_ORTHOGRAPHIC);
 
-	GX_SetZMode(GX_DISABLE,GX_ALWAYS,GX_TRUE);
+	GX_SetZMode(GX_DISABLE,GX_ALWAYS,GX_FALSE);
 
 	GX_ClearVtxDesc();
 	GX_SetVtxDesc(GX_VA_PTNMTXIDX, GX_PNMTX0);
@@ -396,14 +404,14 @@ static void drawInit()
 	GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT);
 	//set vertex attribute formats here
 	GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-	GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
 	GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
 	GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
 
 	//enable textures
 	GX_SetNumChans (1);
 	GX_SetNumTexGens (1);
 	GX_SetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
+	GX_SetTexCoordScaleManually(GX_TEXCOORD0, GX_DISABLE, 0, 0);
 
 	GX_SetNumIndStages (0);
 	GX_SetNumTevStages (2);
@@ -471,7 +479,9 @@ static void _DrawSimpleBox(int x, int y, int width, int height, int depth, GXCol
 
 // Internal
 static void _DrawImageNow(int textureId, int x, int y, int width, int height, int depth, float s1, float s2, float t1, float t2, int centered) {
+	u16 ss = 0, ts = 0;
 	GXTexObj *texObj = NULL;
+	GXTexObj *indTexObj = NULL;
 	GXColor color = (GXColor) {255,255,255,255};
 
 	switch(textureId)
@@ -487,26 +497,18 @@ static void _DrawImageNow(int textureId, int x, int y, int width, int height, in
 					}
 				case GX_TF_IA4:
 				case GX_TF_IA8:
-					texObj = &backdropTexObj; color = (GXColor) {0,0,255,255};
-
 					GX_SetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXA, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO);
 					GX_SetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_RASA);
+
+					texObj = &backdropTexObj; color = (GXColor) {0,0,255,255};
 					break;
 				default:
 					texObj = &backdropTexObj;
 					break;
 			}
 			if(GX_GetTexObjUserData(&backdropIndTexObj) == texObj) {
-				GX_LoadTexObj(&backdropIndTexObj, GX_TEXMAP1);
-
-				GX_SetNumIndStages(1);
-				GX_SetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD0, GX_TEXMAP1);
-				GX_SetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_16, GX_ITS_16);
-
-				GX_SetTevIndTile(GX_TEVSTAGE0, GX_INDTEXSTAGE0, 16, 16, 16, 16, GX_ITF_8, GX_ITM_0, GX_ITB_NONE, GX_ITBA_OFF);
-				GX_SetTevIndRepeat(GX_TEVSTAGE1);
-
-				s1*=2; s2*=2; t1*=2; t2*=2;
+				indTexObj = &backdropIndTexObj;
+				ss = 640; ts = 480;
 			}
 			break;
 		case TEX_GCDVDSMALL:
@@ -520,6 +522,8 @@ static void _DrawImageNow(int textureId, int x, int y, int width, int height, in
 			break;
 		case TEX_QOOB:
 			texObj = &qoobTexObj;
+			indTexObj = &qoobIndTexObj;
+			ss = 96; ts = 102;
 			break;
 		case TEX_WODEIMG:
 			texObj = &wodeimgTexObj; color = (GXColor) {216,216,216,255};
@@ -535,15 +539,17 @@ static void _DrawImageNow(int textureId, int x, int y, int width, int height, in
 			break;
 		case TEX_MEMCARD:
 			texObj = &memcardTexObj;
+			indTexObj = &memcardIndTexObj;
+			ss = 80; ts = 92;
 			break;
 		case TEX_SAMBA:
 			texObj = &sambaTexObj;
 			break;
 		case TEX_BTNHILIGHT:
-			texObj = &btnhilightTexObj; color = (GXColor) {127,134,255,255};
-
 			GX_SetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO);
 			GX_SetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_RASA);
+
+			texObj = &btnhilightTexObj; color = (GXColor) {127,134,255,255};
 			break;
 		case TEX_BTNDEVICE:
 			texObj = &btndeviceTexObj;
@@ -565,11 +571,11 @@ static void _DrawImageNow(int textureId, int x, int y, int width, int height, in
 			break;
 		case TEX_UNCHECKED:
 			texObj = &uncheckedTexObj; color = (GXColor) {87,87,87,255};
-			s1*=2; s2*=2; t1*=2; t2*=2;
+			ss = 32; ts = 32;
 			break;
 		case TEX_STAR:
 			texObj = &starTexObj; color = (GXColor) {255,255,0,255};
-			s1*=2; s2*=2;
+			ss = 16;
 			break;
 		case TEX_GCLOADER:
 			texObj = &gcloaderTexObj; color = (GXColor) {216,216,216,255};
@@ -579,11 +585,34 @@ static void _DrawImageNow(int textureId, int x, int y, int width, int height, in
 			break;
 	}
 
+	if(!ss) ss = GX_GetTexObjWidth(texObj);
+	if(!ts) ts = GX_GetTexObjHeight(texObj);
+	GX_SetTexCoordScaleManually(GX_TEXCOORD0, GX_ENABLE, ss, ts);
+
 	GX_InvalidateTexAll();
 	GXTlutObj *tlutObj = GX_GetTexObjUserData(texObj);
 	if(tlutObj) GX_LoadTlut(tlutObj, GX_GetTexObjTlut(texObj));
 	GX_LoadTexObj(texObj, GX_TEXMAP0);
 
+	if(indTexObj) {
+		GX_LoadTexObj(indTexObj, GX_TEXMAP1);
+
+		GX_SetNumIndStages(1);
+		GX_SetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD0, GX_TEXMAP1);
+		GX_SetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_16, GX_ITS_16);
+
+		switch(GX_GetTexObjFmt(indTexObj)) {
+			case GX_TF_I8:
+				GX_SetTevIndTile(GX_TEVSTAGE0, GX_INDTEXSTAGE0, 16, 16, 16, 0, GX_ITF_8, GX_ITM_0, GX_ITB_NONE, GX_ITBA_OFF);
+				GX_SetTevIndRepeat(GX_TEVSTAGE1);
+				break;
+			case GX_TF_IA8:
+				GX_SetTevIndTile(GX_TEVSTAGE0, GX_INDTEXSTAGE0, 16, 16, 16, 16, GX_ITF_8, GX_ITM_0, GX_ITB_NONE, GX_ITBA_OFF);
+				GX_SetTevIndRepeat(GX_TEVSTAGE1);
+				break;
+		}
+	}
+
 	_drawRect(x, y, width, height, depth, color, s1, s2, t1, t2);
 }
 

cube/swiss/source/gui/IPLFontWrite.c

@@ -178,7 +178,7 @@ void drawFontInit(void)
 	guOrtho(GXprojection2D, 0, 480, 0, 640, 0, 1);
 	GX_LoadProjectionMtx(GXprojection2D, GX_ORTHOGRAPHIC);
 
-	GX_SetZMode(GX_DISABLE,GX_ALWAYS,GX_TRUE);
+	GX_SetZMode(GX_DISABLE,GX_ALWAYS,GX_FALSE);
 
 	GX_ClearVtxDesc();
 	GX_SetVtxDesc(GX_VA_PTNMTXIDX, GX_PNMTX0);
@@ -187,14 +187,15 @@ void drawFontInit(void)
 	GX_SetVtxDesc(GX_VA_CLR0, GX_DIRECT);
 	GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT);
 	//set vertex attribute formats here
-	GX_SetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
+	GX_SetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XY, GX_S16, 0);
 	GX_SetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-	GX_SetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
+	GX_SetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_S16, 0);
 
 	//enable textures
 	GX_SetNumChans (1);
 	GX_SetNumTexGens (1);
 	GX_SetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
+	GX_SetTexCoordScaleManually(GX_TEXCOORD0, GX_ENABLE, 1, 1);
 
 	GX_InvalidateTexAll();
 	GX_InitTexObj(&fontTexObj, &fontFont[0], 512, 512, GX_TF_I4, GX_CLAMP, GX_CLAMP, GX_FALSE);
@@ -253,13 +254,13 @@ void drawString(int x, int y, char *string, float scale, bool centered, GXColor
 		for (i=0; i<4; i++) {
 			int s = (i & 1) ^ ((i & 2) >> 1) ? fontChars.font_size[c] : 1;
 			int t = (i & 2) ? fontChars.fheight : 1;
-			float s0 = ((float) (fontChars.s[c] + s))/512;
-			float t0 = ((float) (fontChars.t[c] + t))/512;
+			int s0 = fontChars.s[c] + s;
+			int t0 = fontChars.t[c] + t;
 			s = (int) s * scale;
 			t = (int) t * scale;
-			GX_Position3s16(x + s, y + t, 0);
+			GX_Position2s16(x + s, y + t);
 			GX_Color4u8(fontColor.r, fontColor.g, fontColor.b, fontColor.a);
-			GX_TexCoord2f32(s0, t0);
+			GX_TexCoord2s16(s0, t0);
 		}
 		GX_End();
 
@@ -302,16 +303,16 @@ void drawStringWithCaret(int x, int y, char *string, float scale, bool centered,
 		for (i=0; i<4; i++) {
 			int s = (i & 1) ^ ((i & 2) >> 1) ? fontChars.font_size[c] : 1;
 			int t = (i & 2) ? fontChars.fheight : 1;
-			float s0 = ((float) (fontChars.s[c] + s))/512;
-			float t0 = ((float) (fontChars.t[c] + t))/512;
+			int s0 = fontChars.s[c] + s;
+			int t0 = fontChars.t[c] + t;
 			s = (int) s * scale;
 			t = (int) t * scale;
-			GX_Position3s16(x + s, y + t, 0);
+			GX_Position2s16(x + s, y + t);
 			if(pos == caretPosition)
 				GX_Color4u8(caretColor.r, caretColor.g, caretColor.b, caretColor.a);
 			else
 				GX_Color4u8(fontColor.r, fontColor.g, fontColor.b, fontColor.a);
-			GX_TexCoord2f32(s0, t0);
+			GX_TexCoord2s16(s0, t0);
 		}
 		GX_End();
 
@@ -385,17 +386,17 @@ void drawStringEllipsis(int x, int y, char *string, float scale, bool centered,
 		for (i=0; i<4; i++) {
 			int s = (i & 1) ^ ((i & 2) >> 1) ? fontChars.font_size[c] : 1;
 			int t = (i & 2) ? fontChars.fheight : 1;
-			float s0 = ((float) (fontChars.s[c] + s))/512;
-			float t0 = ((float) (fontChars.t[c] + t))/512;
+			int s0 = fontChars.s[c] + s;
+			int t0 = fontChars.t[c] + t;
 			s = (int) s * scale;
 			t = (int) t * scale;
 			if(rotateVertical) {
-				GX_Position3s16(x + t, y - s, 0);
+				GX_Position2s16(x + t, y - s);
 			} else {
-				GX_Position3s16(x + s, y + t, 0);
+				GX_Position2s16(x + s, y + t);
 			}
 			GX_Color4u8(fontColor.r, fontColor.g, fontColor.b, fontColor.a);
-			GX_TexCoord2f32(s0, t0);
+			GX_TexCoord2s16(s0, t0);
 		}
 		GX_End();
 

cube/swiss/source/images/images.scf

@@ -1,5 +1,5 @@
 <filepath="backdrop.png" id="backdrop" colfmt=8 palfmt=0 />
-<filepath="backdropind.png" id="backdropind" colfmt=3 />
+<filepath="backdrop_ind.png" id="backdrop_ind" colfmt=3 />
 <filepath="dir.tif" id="dirimg" colfmt=6 />
 <filepath="dol.tif" id="dolimg" colfmt=6 />
 <filepath="dolcli.tif" id="dolcliimg" colfmt=6 />
@@ -9,12 +9,14 @@
 <filepath="gcloader.tif" id="gcloaderimg" colfmt=0 />
 <filepath="hdd.tif" id="hdd" colfmt=9 palfmt=0 />
 <filepath="m2loader.tif" id="m2loaderimg" colfmt=0 />
-<filepath="memcard.tif" id="memcardimg" colfmt=9 palfmt=0 />
+<filepath="memcard.png" id="memcardimg" colfmt=9 palfmt=0 />
+<filepath="memcard_ind.png" id="memcardimg_ind" colfmt=1 />
 <filepath="mp3.tif" id="mp3img" colfmt=6 />
 <filepath="ntscj.tif" id="ntscjimg" colfmt=5 />
 <filepath="ntscu.tif" id="ntscuimg" colfmt=5 />
 <filepath="pal.tif" id="palimg" colfmt=5 />
-<filepath="qoob.tif" id="qoob" colfmt=9 palfmt=0 />
+<filepath="qoob.png" id="qoob" colfmt=9 palfmt=0 />
+<filepath="qoob_ind.png" id="qoob_ind" colfmt=1 />
 <filepath="samba.tif" id="sambaimg" colfmt=3 />
 <filepath="sdsmall.tif" id="sdsmall" colfmt=9 palfmt=0 />
 <filepath="systemimg.tif" id="systemimg" colfmt=3 />