diff options
| author | Robin Watts | 2008-10-26 10:46:55 +0000 |
|---|---|---|
| committer | Robin Watts | 2008-10-26 10:46:55 +0000 |
| commit | ed5beecd33b9e53cb4732dcd9559a76cb5092a78 (patch) | |
| tree | 381b0083fb7a0a164d4f4ef1d24744277ef06034 /backends | |
| parent | 9021921303d88d4d59742a9207ca57ba96dfa535 (diff) | |
| download | scummvm-rg350-ed5beecd33b9e53cb4732dcd9559a76cb5092a78.tar.gz scummvm-rg350-ed5beecd33b9e53cb4732dcd9559a76cb5092a78.tar.bz2 scummvm-rg350-ed5beecd33b9e53cb4732dcd9559a76cb5092a78.zip | |
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 ::.
svn-id: r34850
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/touchkeyboard.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 872a196e9b..458cfe7923 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -2237,7 +2237,7 @@ void uploadSpriteGfx() { 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); diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp index 85f80fac92..17c6a5bc3d 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.cpp +++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp @@ -178,7 +178,7 @@ void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) { 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 @@ void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) { 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++) { |