Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix xworld building with 24-bit lcd

Browse source 
also fix a couple unused vars

Change-Id: Ib05d2e22dd7477bc9bd193232bd3de8a0816beb2
Reviewed-on: http://gerrit.rockbox.org/1079
Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
This commit is contained in:
Franklin Wei 2014-12-23 21:07:10 -05:00 committed by Michael Giacomelli
parent 1bc3964f96
commit 37817268ab
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/plugins/xworld/sys.c
View file

@ -290,7 +290,6 @@ void sys_menu(struct System* sys)
sys->loaded = engine_loadGameState(sys->e, 0);
rb->lcd_update();
mainmenu_sysptr = sys;
int sel = 0;
MENUITEM_STRINGLIST(menu, "XWorld Menu", mainmenu_cb,
"Resume Game", /* 0 */
"Start New Game", /* 1 */
@ -307,8 +306,7 @@ void sys_menu(struct System* sys)
bool quit = false;
while(!quit)
{
int item;
switch(item = rb->do_menu(&menu, &sel, NULL, false))
switch(rb->do_menu(&menu, NULL, NULL, false))
{
case 0:
quit = true;
@ -569,10 +567,17 @@ void sys_copyRect(struct System* sys, uint16_t x, uint16_t y, uint16_t w, uint16
#ifdef HAVE_LCD_COLOR
int r, g, b;
fb_data pix = rb->lcd_framebuffer[y * LCD_WIDTH + x];
#if (LCD_DEPTH == 24)
r = pix.r;
g = pix.g;
b = pix.b;
rb->lcd_framebuffer[y * LCD_WIDTH + x] = (fb_data) { b, g, r };
#else
r = RGB_UNPACK_RED (pix);
g = RGB_UNPACK_GREEN(pix);
b = RGB_UNPACK_BLUE (pix);
rb->lcd_framebuffer[y * LCD_WIDTH + x] = LCD_RGBPACK(0xff - r, 0xff - g, 0xff - b);
#endif
#else
rb->lcd_framebuffer[y * LCD_WIDTH + x] = LCD_BRIGHTNESS(0xff - rb->lcd_framebuffer[y * LCD_WIDTH + x]);
#endif