all repos — mgba @ ebb1c08840aba9166becb55bab9a83ce8b7e2060

mGBA Game Boy Advance Emulator

Fix warnings on gcc
Jeffrey Pfau jeffrey@endrift.com
Thu, 02 May 2013 00:40:12 -0700
commit

ebb1c08840aba9166becb55bab9a83ce8b7e2060

parent

13a46429e200afbc4a6138fcb335bd1e269deaf4

1 files changed, 2 insertions(+), 2 deletions(-)

jump to
M src/gba/renderers/video-software.c → src/gba/renderers/video-software.c 
@@ -360,13 +360,13 @@ }
 
 #define BACKGROUND_DRAW_PIXEL_16_NORMAL \
 	if (tileData & 0xF && !renderer->flags[outX].finalized) { \
-		_composite(renderer, outX, renderer->normalPalette[tileData & 0xF | (mapData.palette << 4)], flags); \
+		_composite(renderer, outX, renderer->normalPalette[(tileData & 0xF) | (mapData.palette << 4)], flags); \
 	} \
 	tileData >>= 4;
 
 #define BACKGROUND_DRAW_PIXEL_16_VARIANT \
 	if (tileData & 0xF && !renderer->flags[outX].finalized) { \
-		_composite(renderer, outX, renderer->variantPalette[tileData & 0xF | (mapData.palette << 4)], flags); \
+		_composite(renderer, outX, renderer->variantPalette[(tileData & 0xF) | (mapData.palette << 4)], flags); \
 	} \
 	tileData >>= 4;