[Scummvm-cvs-logs] SF.net SVN: scummvm:[34850] scummvm/trunk/backends/platform/ds/arm9/source

robinwatts at users.sourceforge.net robinwatts at users.sourceforge.net
Sun Oct 26 11:46:56 CET 2008


Revision: 34850
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34850&view=rev
Author:   robinwatts
Date:     2008-10-26 10:46:55 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
DS port: My version of devkitpro complains that various symbols are defined in
a different namespace. The fix is to refer to these symbols using ::.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2008-10-26 10:33:04 UTC (rev 34849)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2008-10-26 10:46:55 UTC (rev 34850)
@@ -2237,7 +2237,7 @@
 	vramSetBankE(VRAM_E_MAIN_SPRITE); 
 
 	// Convert texture from 24bit 888 to 16bit 1555, remembering to set top bit!
-	u8* srcTex = (u8 *) icons_raw;
+	u8* srcTex = (u8 *) ::icons_raw;
 	for (int r = 32 * 256 ; r >= 0; r--) {
 		SPRITE_GFX_SUB[r] = 0x8000 | (srcTex[r * 3] >> 3) | ((srcTex[r * 3 + 1] >> 3) << 5) | ((srcTex[r * 3 + 2] >> 3) << 10);
 		SPRITE_GFX[r] = 0x8000 | (srcTex[r * 3] >> 3) | ((srcTex[r * 3 + 1] >> 3) << 5) | ((srcTex[r * 3 + 2] >> 3) << 10);

Modified: scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp	2008-10-26 10:33:04 UTC (rev 34849)
+++ scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp	2008-10-26 10:46:55 UTC (rev 34850)
@@ -178,7 +178,7 @@
 	
 	for (int r = 0; r < KEYBOARD_DATA_SIZE / 2; r++) {
 //		*saveSpace++ = ((u16 *) CHAR_BASE_BLOCK_SUB(tileBase))[r];
-		((u16 *) CHAR_BASE_BLOCK_SUB(tileBase))[r] = ((u16 *) (keyboard_raw))[r];
+		((u16 *) CHAR_BASE_BLOCK_SUB(tileBase))[r] = ((u16 *) (::keyboard_raw))[r];
 	}
 	
 	for (int r = 0; r < 16; r++) {
@@ -189,7 +189,7 @@
 	for (int tile = 0; tile < 94; tile++) {
 		
 		u16* tileAddr = (u16 *) (CHAR_BASE_BLOCK_SUB(tileBase) + ((KEYBOARD_DATA_SIZE) + (tile * 32)));
-		u8* src = ((u8 *) (_8x8font_tga_raw)) + 18 + tile * 8;
+		u8* src = ((u8 *) (::_8x8font_tga_raw)) + 18 + tile * 8;
 
 		for (int y = 0 ; y < 8; y++) {
 			for (int x = 0; x < 2; x++) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list