diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/doom/am_map.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/d_main.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/g_game.c | 9 | ||||
-rw-r--r-- | apps/plugins/doom/hu_lib.c | 4 | ||||
-rw-r--r-- | apps/plugins/doom/i_sound.c | 15 | ||||
-rw-r--r-- | apps/plugins/doom/m_menu.c | 14 | ||||
-rw-r--r-- | apps/plugins/doom/p_doors.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/p_spec.c | 5 | ||||
-rw-r--r-- | apps/plugins/doom/v_video.c | 3 | ||||
-rw-r--r-- | apps/plugins/doom/wi_stuff.c | 3 | ||||
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.c | 10 | ||||
-rw-r--r-- | apps/plugins/midi/midiutil.c | 3 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 4 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 12 | ||||
-rw-r--r-- | apps/plugins/reversi/reversi-gui.c | 7 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 8 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 4 |
17 files changed, 53 insertions, 54 deletions
diff --git a/apps/plugins/doom/am_map.c b/apps/plugins/doom/am_map.c index ff74e9938f..88e27b4dc2 100644 --- a/apps/plugins/doom/am_map.c +++ b/apps/plugins/doom/am_map.c | |||
@@ -632,7 +632,6 @@ boolean AM_Responder | |||
632 | ( event_t* ev ) | 632 | ( event_t* ev ) |
633 | { | 633 | { |
634 | int rc; | 634 | int rc; |
635 | static int cheatstate=0; | ||
636 | static int bigstate=0; | 635 | static int bigstate=0; |
637 | static char buffer[20]; | 636 | static char buffer[20]; |
638 | int ch; // phares | 637 | int ch; // phares |
@@ -732,7 +731,6 @@ boolean AM_Responder | |||
732 | } | 731 | } |
733 | else // phares | 732 | else // phares |
734 | { | 733 | { |
735 | cheatstate=0; | ||
736 | rc = false; | 734 | rc = false; |
737 | } | 735 | } |
738 | } | 736 | } |
diff --git a/apps/plugins/doom/d_main.c b/apps/plugins/doom/d_main.c index 498d93cb62..be45e6a37e 100644 --- a/apps/plugins/doom/d_main.c +++ b/apps/plugins/doom/d_main.c | |||
@@ -179,7 +179,6 @@ void D_Display (void) | |||
179 | { | 179 | { |
180 | static boolean isborderstate IDATA_ATTR= false; | 180 | static boolean isborderstate IDATA_ATTR= false; |
181 | static boolean borderwillneedredraw IDATA_ATTR= false; | 181 | static boolean borderwillneedredraw IDATA_ATTR= false; |
182 | static boolean inhelpscreensstate IDATA_ATTR= false; | ||
183 | static gamestate_t oldgamestate IDATA_ATTR= -1; | 182 | static gamestate_t oldgamestate IDATA_ATTR= -1; |
184 | boolean wipe; | 183 | boolean wipe; |
185 | boolean viewactive = false, isborder = false; | 184 | boolean viewactive = false, isborder = false; |
@@ -254,7 +253,6 @@ void D_Display (void) | |||
254 | HU_Drawer(); | 253 | HU_Drawer(); |
255 | } | 254 | } |
256 | 255 | ||
257 | inhelpscreensstate = inhelpscreens; | ||
258 | isborderstate = isborder; | 256 | isborderstate = isborder; |
259 | oldgamestate = wipegamestate = gamestate; | 257 | oldgamestate = wipegamestate = gamestate; |
260 | 258 | ||
diff --git a/apps/plugins/doom/g_game.c b/apps/plugins/doom/g_game.c index 8aab9fc3cf..e41c84c378 100644 --- a/apps/plugins/doom/g_game.c +++ b/apps/plugins/doom/g_game.c | |||
@@ -1549,7 +1549,7 @@ static const size_t num_version_headers = sizeof(version_headers) / sizeof(versi | |||
1549 | 1549 | ||
1550 | void G_DoLoadGame(void) | 1550 | void G_DoLoadGame(void) |
1551 | { | 1551 | { |
1552 | int length, i; | 1552 | int i; |
1553 | // CPhipps - do savegame filename stuff here | 1553 | // CPhipps - do savegame filename stuff here |
1554 | char name[100+1]; // killough 3/22/98 | 1554 | char name[100+1]; // killough 3/22/98 |
1555 | int savegame_compatibility = -1; | 1555 | int savegame_compatibility = -1; |
@@ -1558,7 +1558,7 @@ void G_DoLoadGame(void) | |||
1558 | 1558 | ||
1559 | gameaction = ga_nothing; | 1559 | gameaction = ga_nothing; |
1560 | 1560 | ||
1561 | length = M_ReadFile(name, &savebuffer); | 1561 | M_ReadFile(name, &savebuffer); |
1562 | save_p = savebuffer + SAVESTRINGSIZE; | 1562 | save_p = savebuffer + SAVESTRINGSIZE; |
1563 | 1563 | ||
1564 | // CPhipps - read the description field, compare with supported ones | 1564 | // CPhipps - read the description field, compare with supported ones |
@@ -2565,7 +2565,6 @@ static const byte* G_ReadDemoHeader(const byte *demo_p) | |||
2565 | skill_t skill; | 2565 | skill_t skill; |
2566 | int i, episode, map; | 2566 | int i, episode, map; |
2567 | int demover; | 2567 | int demover; |
2568 | const byte *option_p = NULL; /* killough 11/98 */ | ||
2569 | 2568 | ||
2570 | basetic = gametic; // killough 9/29/98 | 2569 | basetic = gametic; // killough 9/29/98 |
2571 | 2570 | ||
@@ -2674,10 +2673,6 @@ static const byte* G_ReadDemoHeader(const byte *demo_p) | |||
2674 | deathmatch = *demo_p++; | 2673 | deathmatch = *demo_p++; |
2675 | consoleplayer = *demo_p++; | 2674 | consoleplayer = *demo_p++; |
2676 | 2675 | ||
2677 | /* killough 11/98: save option pointer for below */ | ||
2678 | if (mbf_features) | ||
2679 | option_p = demo_p; | ||
2680 | |||
2681 | demo_p = G_ReadOptions(demo_p); // killough 3/1/98: Read game options | 2676 | demo_p = G_ReadOptions(demo_p); // killough 3/1/98: Read game options |
2682 | 2677 | ||
2683 | if (demover == 200) // killough 6/3/98: partially fix v2.00 demos | 2678 | if (demover == 200) // killough 6/3/98: partially fix v2.00 demos |
diff --git a/apps/plugins/doom/hu_lib.c b/apps/plugins/doom/hu_lib.c index df2fa883ec..eacb26b287 100644 --- a/apps/plugins/doom/hu_lib.c +++ b/apps/plugins/doom/hu_lib.c | |||
@@ -532,7 +532,7 @@ void HUlib_drawMBg | |||
532 | // | 532 | // |
533 | void HUlib_drawMText(hu_mtext_t* m) | 533 | void HUlib_drawMText(hu_mtext_t* m) |
534 | { | 534 | { |
535 | int i, idx, y; | 535 | int i, idx; |
536 | hu_textline_t *l; | 536 | hu_textline_t *l; |
537 | 537 | ||
538 | if (!*m->on) | 538 | if (!*m->on) |
@@ -541,7 +541,7 @@ void HUlib_drawMText(hu_mtext_t* m) | |||
541 | // draw everything | 541 | // draw everything |
542 | if (hud_list_bgon) | 542 | if (hud_list_bgon) |
543 | HUlib_drawMBg(m->x,m->y,m->w,m->h,m->bg); | 543 | HUlib_drawMBg(m->x,m->y,m->w,m->h,m->bg); |
544 | y = m->y + HU_REFRESHSPACING; | 544 | |
545 | for (i=0 ; i<m->nl ; i++) | 545 | for (i=0 ; i<m->nl ; i++) |
546 | { | 546 | { |
547 | idx = m->cl - i; | 547 | idx = m->cl - i; |
diff --git a/apps/plugins/doom/i_sound.c b/apps/plugins/doom/i_sound.c index 35cecd8abb..2d7b592818 100644 --- a/apps/plugins/doom/i_sound.c +++ b/apps/plugins/doom/i_sound.c | |||
@@ -534,26 +534,27 @@ static int musicdies=-1; | |||
534 | void I_PlaySong(int handle, int looping) | 534 | void I_PlaySong(int handle, int looping) |
535 | { | 535 | { |
536 | // UNUSED. | 536 | // UNUSED. |
537 | handle = looping = 0; | 537 | (void)handle; |
538 | (void)looping; | ||
538 | musicdies = gametic + TICRATE*30; | 539 | musicdies = gametic + TICRATE*30; |
539 | } | 540 | } |
540 | 541 | ||
541 | void I_PauseSong (int handle) | 542 | void I_PauseSong (int handle) |
542 | { | 543 | { |
543 | // UNUSED. | 544 | // UNUSED. |
544 | handle = 0; | 545 | (void)handle; |
545 | } | 546 | } |
546 | 547 | ||
547 | void I_ResumeSong (int handle) | 548 | void I_ResumeSong (int handle) |
548 | { | 549 | { |
549 | // UNUSED. | 550 | // UNUSED. |
550 | handle = 0; | 551 | (void)handle; |
551 | } | 552 | } |
552 | 553 | ||
553 | void I_StopSong(int handle) | 554 | void I_StopSong(int handle) |
554 | { | 555 | { |
555 | // UNUSED. | 556 | // UNUSED. |
556 | handle = 0; | 557 | (void)handle; |
557 | 558 | ||
558 | looping = 0; | 559 | looping = 0; |
559 | musicdies = 0; | 560 | musicdies = 0; |
@@ -562,13 +563,13 @@ void I_StopSong(int handle) | |||
562 | void I_UnRegisterSong(int handle) | 563 | void I_UnRegisterSong(int handle) |
563 | { | 564 | { |
564 | // UNUSED. | 565 | // UNUSED. |
565 | handle = 0; | 566 | (void)handle; |
566 | } | 567 | } |
567 | 568 | ||
568 | int I_RegisterSong(const void *data) | 569 | int I_RegisterSong(const void *data) |
569 | { | 570 | { |
570 | // UNUSED. | 571 | // UNUSED. |
571 | data = NULL; | 572 | (void)data; |
572 | 573 | ||
573 | return 1; | 574 | return 1; |
574 | } | 575 | } |
@@ -577,7 +578,7 @@ int I_RegisterSong(const void *data) | |||
577 | int I_QrySongPlaying(int handle) | 578 | int I_QrySongPlaying(int handle) |
578 | { | 579 | { |
579 | // UNUSED. | 580 | // UNUSED. |
580 | handle = 0; | 581 | (void)handle; |
581 | return looping || musicdies > gametic; | 582 | return looping || musicdies > gametic; |
582 | } | 583 | } |
583 | 584 | ||
diff --git a/apps/plugins/doom/m_menu.c b/apps/plugins/doom/m_menu.c index b0b0f9fff8..aa82959aaf 100644 --- a/apps/plugins/doom/m_menu.c +++ b/apps/plugins/doom/m_menu.c | |||
@@ -522,7 +522,6 @@ menu_t SaveDef = | |||
522 | void M_ReadSaveStrings(void) | 522 | void M_ReadSaveStrings(void) |
523 | { | 523 | { |
524 | int handle; | 524 | int handle; |
525 | int count; | ||
526 | int i; | 525 | int i; |
527 | char name[256]; | 526 | char name[256]; |
528 | 527 | ||
@@ -540,7 +539,7 @@ void M_ReadSaveStrings(void) | |||
540 | LoadMenu[i].status = 0; | 539 | LoadMenu[i].status = 0; |
541 | continue; | 540 | continue; |
542 | } | 541 | } |
543 | count = read (handle, &savegamestrings[i], SAVESTRINGSIZE); | 542 | read (handle, &savegamestrings[i], SAVESTRINGSIZE); |
544 | close (handle); | 543 | close (handle); |
545 | LoadMenu[i].status = 1; | 544 | LoadMenu[i].status = 1; |
546 | } | 545 | } |
@@ -1027,8 +1026,7 @@ void M_Options(int choice) | |||
1027 | // | 1026 | // |
1028 | void M_ChangeMessages(int choice) | 1027 | void M_ChangeMessages(int choice) |
1029 | { | 1028 | { |
1030 | // warning: unused parameter `int choice' | 1029 | (void)choice; |
1031 | choice = 0; | ||
1032 | showMessages = 1 - showMessages; | 1030 | showMessages = 1 - showMessages; |
1033 | 1031 | ||
1034 | if (!showMessages) | 1032 | if (!showMessages) |
@@ -1059,7 +1057,7 @@ void M_EndGameResponse(int ch) | |||
1059 | 1057 | ||
1060 | void M_EndGame(int choice) | 1058 | void M_EndGame(int choice) |
1061 | { | 1059 | { |
1062 | choice = 0; | 1060 | (void)choice; |
1063 | if (!usergame) | 1061 | if (!usergame) |
1064 | { | 1062 | { |
1065 | S_StartSound(NULL,sfx_oof); | 1063 | S_StartSound(NULL,sfx_oof); |
@@ -1083,19 +1081,19 @@ void M_EndGame(int choice) | |||
1083 | // | 1081 | // |
1084 | void M_ReadThis(int choice) | 1082 | void M_ReadThis(int choice) |
1085 | { | 1083 | { |
1086 | choice = 0; | 1084 | (void)choice; |
1087 | M_SetupNextMenu(&ReadDef1); | 1085 | M_SetupNextMenu(&ReadDef1); |
1088 | } | 1086 | } |
1089 | 1087 | ||
1090 | void M_ReadThis2(int choice) | 1088 | void M_ReadThis2(int choice) |
1091 | { | 1089 | { |
1092 | choice = 0; | 1090 | (void)choice; |
1093 | M_SetupNextMenu(&ReadDef2); | 1091 | M_SetupNextMenu(&ReadDef2); |
1094 | } | 1092 | } |
1095 | 1093 | ||
1096 | void M_FinishReadThis(int choice) | 1094 | void M_FinishReadThis(int choice) |
1097 | { | 1095 | { |
1098 | choice = 0; | 1096 | (void)choice; |
1099 | M_SetupNextMenu(&MainDef); | 1097 | M_SetupNextMenu(&MainDef); |
1100 | } | 1098 | } |
1101 | 1099 | ||
diff --git a/apps/plugins/doom/p_doors.c b/apps/plugins/doom/p_doors.c index 0b6d777e17..750b3474bd 100644 --- a/apps/plugins/doom/p_doors.c +++ b/apps/plugins/doom/p_doors.c | |||
@@ -434,7 +434,6 @@ int EV_VerticalDoor | |||
434 | mobj_t* thing ) | 434 | mobj_t* thing ) |
435 | { | 435 | { |
436 | player_t* player; | 436 | player_t* player; |
437 | int secnum; | ||
438 | sector_t* sec; | 437 | sector_t* sec; |
439 | vldoor_t* door; | 438 | vldoor_t* door; |
440 | 439 | ||
@@ -492,7 +491,6 @@ int EV_VerticalDoor | |||
492 | 491 | ||
493 | // get the sector on the second side of activating linedef | 492 | // get the sector on the second side of activating linedef |
494 | sec = sides[line->sidenum[1]].sector; | 493 | sec = sides[line->sidenum[1]].sector; |
495 | secnum = sec-sectors; | ||
496 | 494 | ||
497 | /* if door already has a thinker, use it | 495 | /* if door already has a thinker, use it |
498 | * cph 2001/04/05 - | 496 | * cph 2001/04/05 - |
diff --git a/apps/plugins/doom/p_spec.c b/apps/plugins/doom/p_spec.c index f2757f8399..8ad77a732d 100644 --- a/apps/plugins/doom/p_spec.c +++ b/apps/plugins/doom/p_spec.c | |||
@@ -2394,11 +2394,6 @@ void P_SpawnSpecials (void) | |||
2394 | { | 2394 | { |
2395 | sector_t* sector; | 2395 | sector_t* sector; |
2396 | int i; | 2396 | int i; |
2397 | int episode; | ||
2398 | |||
2399 | episode = 1; | ||
2400 | if (W_CheckNumForName("texture2") >= 0) | ||
2401 | episode = 2; | ||
2402 | 2397 | ||
2403 | // See if -timer needs to be used. | 2398 | // See if -timer needs to be used. |
2404 | levelTimer = false; | 2399 | levelTimer = false; |
diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c index 76993ea5ee..8c475614ff 100644 --- a/apps/plugins/doom/v_video.c +++ b/apps/plugins/doom/v_video.c | |||
@@ -525,12 +525,9 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, | |||
525 | int DXI = (320<<16) / SCREENWIDTH; | 525 | int DXI = (320<<16) / SCREENWIDTH; |
526 | int DY = (SCREENHEIGHT<<16) / 200; | 526 | int DY = (SCREENHEIGHT<<16) / 200; |
527 | register int DYI = (200<<16) / SCREENHEIGHT; | 527 | register int DYI = (200<<16) / SCREENHEIGHT; |
528 | int DY2, DYI2; | ||
529 | 528 | ||
530 | stretchx = ( x * DX ) >> 16; | 529 | stretchx = ( x * DX ) >> 16; |
531 | stretchy = ( y * DY ) >> 16; | 530 | stretchy = ( y * DY ) >> 16; |
532 | DY2 = DY / 2; | ||
533 | DYI2 = DYI* 2; | ||
534 | 531 | ||
535 | if (!scrn) | 532 | if (!scrn) |
536 | V_MarkRect ( stretchx, stretchy, (SHORT( patch->width ) * DX ) >> 16, | 533 | V_MarkRect ( stretchx, stretchy, (SHORT( patch->width ) * DX ) >> 16, |
diff --git a/apps/plugins/doom/wi_stuff.c b/apps/plugins/doom/wi_stuff.c index 5aec366026..7c7831d084 100644 --- a/apps/plugins/doom/wi_stuff.c +++ b/apps/plugins/doom/wi_stuff.c | |||
@@ -1176,11 +1176,8 @@ void WI_drawDeathmatchStats(void) | |||
1176 | int y; | 1176 | int y; |
1177 | int w; | 1177 | int w; |
1178 | 1178 | ||
1179 | int lh; // line height | ||
1180 | int halfface = V_NamePatchWidth(facebackp)/2; | 1179 | int halfface = V_NamePatchWidth(facebackp)/2; |
1181 | 1180 | ||
1182 | lh = WI_SPACINGY; | ||
1183 | |||
1184 | WI_slamBackground(); | 1181 | WI_slamBackground(); |
1185 | 1182 | ||
1186 | // draw animated background | 1183 | // draw animated background |
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index 0635a877d4..6750c6c912 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c | |||
@@ -345,7 +345,9 @@ static int show_menu(void) /* return 1 to quit */ | |||
345 | static int ask_and_get_audio_buffer(const char *filename) | 345 | static int ask_and_get_audio_buffer(const char *filename) |
346 | { | 346 | { |
347 | int button; | 347 | int button; |
348 | #if defined(IMGVIEW_ZOOM_PRE) | ||
348 | int lastbutton = BUTTON_NONE; | 349 | int lastbutton = BUTTON_NONE; |
350 | #endif | ||
349 | rb->lcd_setfont(FONT_SYSFIXED); | 351 | rb->lcd_setfont(FONT_SYSFIXED); |
350 | rb->lcd_clear_display(); | 352 | rb->lcd_clear_display(); |
351 | rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); | 353 | rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); |
@@ -414,9 +416,10 @@ static int ask_and_get_audio_buffer(const char *filename) | |||
414 | == SYS_USB_CONNECTED) | 416 | == SYS_USB_CONNECTED) |
415 | return PLUGIN_USB_CONNECTED; | 417 | return PLUGIN_USB_CONNECTED; |
416 | } | 418 | } |
417 | 419 | #if defined(IMGVIEW_ZOOM_PRE) | |
418 | if (button != BUTTON_NONE) | 420 | if (button != BUTTON_NONE) |
419 | lastbutton = button; | 421 | lastbutton = button; |
422 | #endif | ||
420 | } | 423 | } |
421 | } | 424 | } |
422 | #endif /* USE_PLUG_BUF */ | 425 | #endif /* USE_PLUG_BUF */ |
@@ -548,7 +551,9 @@ static void pan_view_down(struct image_info *info) | |||
548 | static int scroll_bmp(struct image_info *info) | 551 | static int scroll_bmp(struct image_info *info) |
549 | { | 552 | { |
550 | int button; | 553 | int button; |
554 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | ||
551 | int lastbutton = BUTTON_NONE; | 555 | int lastbutton = BUTTON_NONE; |
556 | #endif | ||
552 | 557 | ||
553 | while (true) | 558 | while (true) |
554 | { | 559 | { |
@@ -669,9 +674,10 @@ static int scroll_bmp(struct image_info *info) | |||
669 | break; | 674 | break; |
670 | 675 | ||
671 | } /* switch */ | 676 | } /* switch */ |
672 | 677 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | |
673 | if (button != BUTTON_NONE) | 678 | if (button != BUTTON_NONE) |
674 | lastbutton = button; | 679 | lastbutton = button; |
680 | #endif | ||
675 | } /* while (true) */ | 681 | } /* while (true) */ |
676 | } | 682 | } |
677 | 683 | ||
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c index e10c593dc1..f960b72654 100644 --- a/apps/plugins/midi/midiutil.c +++ b/apps/plugins/midi/midiutil.c | |||
@@ -136,11 +136,10 @@ int midi_debug(const char *fmt, ...) | |||
136 | { | 136 | { |
137 | static int p_xtpt = 0; | 137 | static int p_xtpt = 0; |
138 | char p_buf[50]; | 138 | char p_buf[50]; |
139 | bool ok; | ||
140 | va_list ap; | 139 | va_list ap; |
141 | 140 | ||
142 | va_start(ap, fmt); | 141 | va_start(ap, fmt); |
143 | ok = rb->vsnprintf(p_buf,sizeof(p_buf), fmt, ap); | 142 | rb->vsnprintf(p_buf,sizeof(p_buf), fmt, ap); |
144 | va_end(ap); | 143 | va_end(ap); |
145 | 144 | ||
146 | int i=0; | 145 | int i=0; |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index adecc00502..5b5b422e08 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -692,7 +692,9 @@ enum minesweeper_status minesweeper( void ) | |||
692 | { | 692 | { |
693 | int i, j; | 693 | int i, j; |
694 | int button; | 694 | int button; |
695 | #if defined(HAVE_TOUCHSCREEN) || defined(MINESWP_TOGGLE_PRE) | ||
695 | int lastbutton = BUTTON_NONE; | 696 | int lastbutton = BUTTON_NONE; |
697 | #endif | ||
696 | 698 | ||
697 | /* the cursor coordinates */ | 699 | /* the cursor coordinates */ |
698 | int x=0, y=0; | 700 | int x=0, y=0; |
@@ -898,8 +900,10 @@ enum minesweeper_status minesweeper( void ) | |||
898 | return MINESWEEPER_USB; | 900 | return MINESWEEPER_USB; |
899 | break; | 901 | break; |
900 | } | 902 | } |
903 | #if defined(HAVE_TOUCHSCREEN) || defined(MINESWP_TOGGLE_PRE) | ||
901 | if( button != BUTTON_NONE ) | 904 | if( button != BUTTON_NONE ) |
902 | lastbutton = button; | 905 | lastbutton = button; |
906 | #endif | ||
903 | } | 907 | } |
904 | 908 | ||
905 | } | 909 | } |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 22136d8393..2a84307857 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -607,7 +607,7 @@ static void draw_oriented_mono_bitmap_part(const unsigned char *src, | |||
607 | { | 607 | { |
608 | const unsigned char *src_end; | 608 | const unsigned char *src_end; |
609 | fb_data *dst, *dst_end; | 609 | fb_data *dst, *dst_end; |
610 | unsigned fg_pattern, bg_pattern; | 610 | unsigned fg_pattern; |
611 | 611 | ||
612 | if (x + width > SCREEN_WIDTH) | 612 | if (x + width > SCREEN_WIDTH) |
613 | width = SCREEN_WIDTH - x; /* Clip right */ | 613 | width = SCREEN_WIDTH - x; /* Clip right */ |
@@ -623,8 +623,8 @@ static void draw_oriented_mono_bitmap_part(const unsigned char *src, | |||
623 | if (height <= 0) | 623 | if (height <= 0) |
624 | return; /* nothing left to do */ | 624 | return; /* nothing left to do */ |
625 | 625 | ||
626 | fg_pattern = rb->lcd_get_foreground(); | 626 | fg_pattern = rb->lcd_get_foreground(); |
627 | bg_pattern = rb->lcd_get_background(); | 627 | /*bg_pattern =*/ rb->lcd_get_background(); |
628 | 628 | ||
629 | src += stride * (src_y >> 3) + src_x; /* move starting point */ | 629 | src += stride * (src_y >> 3) + src_x; /* move starting point */ |
630 | src_y &= 7; | 630 | src_y &= 7; |
@@ -719,7 +719,7 @@ static void draw_oriented_alpha_bitmap_part(const unsigned char *src, | |||
719 | int width, int height) | 719 | int width, int height) |
720 | { | 720 | { |
721 | fb_data *dst, *dst_start; | 721 | fb_data *dst, *dst_start; |
722 | unsigned fg_pattern, bg_pattern; | 722 | unsigned fg_pattern; |
723 | 723 | ||
724 | if (x + width > SCREEN_WIDTH) | 724 | if (x + width > SCREEN_WIDTH) |
725 | width = SCREEN_WIDTH - x; /* Clip right */ | 725 | width = SCREEN_WIDTH - x; /* Clip right */ |
@@ -738,8 +738,8 @@ static void draw_oriented_alpha_bitmap_part(const unsigned char *src, | |||
738 | /* initialize blending */ | 738 | /* initialize blending */ |
739 | BLEND_INIT; | 739 | BLEND_INIT; |
740 | 740 | ||
741 | fg_pattern = rb->lcd_get_foreground(); | 741 | fg_pattern = rb->lcd_get_foreground(); |
742 | bg_pattern = rb->lcd_get_background(); | 742 | /*bg_pattern=*/ rb->lcd_get_background(); |
743 | 743 | ||
744 | dst_start = rb->lcd_framebuffer + (LCD_WIDTH - y - 1) + x*LCD_WIDTH; | 744 | dst_start = rb->lcd_framebuffer + (LCD_WIDTH - y - 1) + x*LCD_WIDTH; |
745 | int col, row = height; | 745 | int col, row = height; |
diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index 6f5d53da58..184b5ad7f0 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c | |||
@@ -610,7 +610,10 @@ enum plugin_status plugin_start(const void *parameter) { | |||
610 | #ifdef HAVE_TOUCHSCREEN | 610 | #ifdef HAVE_TOUCHSCREEN |
611 | int button_x, button_y; | 611 | int button_x, button_y; |
612 | #endif | 612 | #endif |
613 | #if defined(REVERSI_BUTTON_MENU_LONGPRESS) || \ | ||
614 | defined(REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS) | ||
613 | int lastbutton = BUTTON_NONE; | 615 | int lastbutton = BUTTON_NONE; |
616 | #endif | ||
614 | int row, col; | 617 | int row, col; |
615 | int w_cnt, b_cnt; | 618 | int w_cnt, b_cnt; |
616 | 619 | ||
@@ -787,10 +790,12 @@ enum plugin_status plugin_start(const void *parameter) { | |||
787 | /* Quit if USB has been connected */ | 790 | /* Quit if USB has been connected */ |
788 | return PLUGIN_USB_CONNECTED; | 791 | return PLUGIN_USB_CONNECTED; |
789 | } | 792 | } |
790 | 793 | #if defined(REVERSI_BUTTON_MENU_LONGPRESS) || \ | |
794 | defined(REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS) | ||
791 | if (button != BUTTON_NONE) { | 795 | if (button != BUTTON_NONE) { |
792 | lastbutton = button; | 796 | lastbutton = button; |
793 | } | 797 | } |
798 | #endif | ||
794 | } | 799 | } |
795 | 800 | ||
796 | return PLUGIN_OK; | 801 | return PLUGIN_OK; |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 29bdbbbba5..157f53ca92 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -1527,7 +1527,10 @@ static int sokoban_menu(void) | |||
1527 | static bool sokoban_loop(void) | 1527 | static bool sokoban_loop(void) |
1528 | { | 1528 | { |
1529 | bool moved; | 1529 | bool moved; |
1530 | int i = 0, button = 0, lastbutton = 0; | 1530 | int i = 0, button = 0; |
1531 | #if defined(SOKOBAN_UNDO_PRE) | ||
1532 | int lastbutton = 0; | ||
1533 | #endif | ||
1531 | int w, h; | 1534 | int w, h; |
1532 | char *loc; | 1535 | char *loc; |
1533 | 1536 | ||
@@ -1629,8 +1632,9 @@ static bool sokoban_loop(void) | |||
1629 | return PLUGIN_USB_CONNECTED; | 1632 | return PLUGIN_USB_CONNECTED; |
1630 | break; | 1633 | break; |
1631 | } | 1634 | } |
1632 | 1635 | #if defined(SOKOBAN_UNDO_PRE) | |
1633 | lastbutton = button; | 1636 | lastbutton = button; |
1637 | #endif | ||
1634 | 1638 | ||
1635 | if (moved) { | 1639 | if (moved) { |
1636 | rb->lcd_clear_display(); | 1640 | rb->lcd_clear_display(); |
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index 81c00803f8..f0bff4d2a4 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -1029,7 +1029,9 @@ enum plugin_status plugin_start(const void* parameter) | |||
1029 | { | 1029 | { |
1030 | bool exit; | 1030 | bool exit; |
1031 | int button; | 1031 | int button; |
1032 | #if defined(SUDOKU_BUTTON_TOGGLE_PRE) || defined(SUDOKU_BUTTON_MENU_PRE) | ||
1032 | int lastbutton = BUTTON_NONE; | 1033 | int lastbutton = BUTTON_NONE; |
1034 | #endif | ||
1033 | int res; | 1035 | int res; |
1034 | int rc = PLUGIN_OK; | 1036 | int rc = PLUGIN_OK; |
1035 | long ticks; | 1037 | long ticks; |
@@ -1289,8 +1291,10 @@ enum plugin_status plugin_start(const void* parameter) | |||
1289 | } | 1291 | } |
1290 | break; | 1292 | break; |
1291 | } | 1293 | } |
1294 | #if defined(SUDOKU_BUTTON_TOGGLE_PRE) || defined(SUDOKU_BUTTON_MENU_PRE) | ||
1292 | if (button != BUTTON_NONE) | 1295 | if (button != BUTTON_NONE) |
1293 | lastbutton = button; | 1296 | lastbutton = button; |
1297 | #endif | ||
1294 | 1298 | ||
1295 | display_board(&state); | 1299 | display_board(&state); |
1296 | } | 1300 | } |