Index: apps/plugins/xobox.c =================================================================== --- apps/plugins/xobox.c (Revision 21198) +++ apps/plugins/xobox.c (Arbeitskopie) @@ -307,8 +307,6 @@ #define PIC_QIX 0 #define PIC_PLAYER 1 -#define MENU_START 0 -#define MENU_QUIT 1 /* The time (in ms) for one iteration through the game loop - decrease this to speed up the game - note that current_tick is (currently) only accurate @@ -930,9 +928,9 @@ if (ingame) { MENUITEM_STRINGLIST (main_menu, "Xobox Menu", NULL, "Resume Game", - "Restart Level", + "Restart Game", "Speed", - "Difficult", + "Difficulty", "Playback Control", "Quit"); @@ -957,7 +955,7 @@ case 5: return 1; case MENU_ATTACHED_USB: - return 1; + return MENU_ATTACHED_USB; default: break; } @@ -965,7 +963,7 @@ } else { MENUITEM_STRINGLIST (main_menu, "Xobox Menu", NULL, - "Start Game", + "Start New Game", "Speed", "Difficulty", "Playback Control", @@ -990,7 +988,7 @@ case 4: return 1; case MENU_ATTACHED_USB: - return 1; + return MENU_ATTACHED_USB; default: break; } @@ -1005,7 +1003,7 @@ bool pause = false; int end; - if (xobox_menu(false)==1) { + if (xobox_menu(false)!=0) { return PLUGIN_OK; } @@ -1014,8 +1012,8 @@ #ifdef HAS_BUTTON_HOLD if (rb->button_hold()) { - pause = true; - rb->splash (HZ, "PAUSED"); + pause = true; + rb->splash (HZ, "Paused"); } #endif @@ -1043,8 +1041,10 @@ rb->splash (HZ, "Paused"); break; case QUIT: - if (xobox_menu(true)==1) { - quit = true; + if (!pause) { + if (xobox_menu(true)!=0) { + quit = true; + } } break; default: @@ -1058,7 +1058,7 @@ } if (player.gameover) { rb->splash (HZ, "Game Over!"); - if (xobox_menu(false)==1) { + if (xobox_menu(false)!=0) { quit = true; } }