summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stummvoll <michael@stummi.org>2010-11-24 11:39:40 +0000
committerMichael Stummvoll <michael@stummi.org>2010-11-24 11:39:40 +0000
commit72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd (patch)
treea953173e09afc2a187234a6054c573fc2634e785
parent681302171b76239f13962b7f747768335c333888 (diff)
downloadrockbox-72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd.tar.gz
rockbox-72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd.zip
Adding an reset option to the rockboy menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28655 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/rockboy/menu.c9
-rw-r--r--manual/plugins/rockboy.tex1
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c
index ab27f3dece..8139437bb5 100644
--- a/apps/plugins/rockboy/menu.c
+++ b/apps/plugins/rockboy/menu.c
@@ -11,6 +11,7 @@
11#include "save.h" 11#include "save.h"
12#include "rtc-gb.h" 12#include "rtc-gb.h"
13#include "pcm.h" 13#include "pcm.h"
14#include "emu.h"
14 15
15#define SLOT_COUNT 50 16#define SLOT_COUNT 50
16#define DESC_SIZE 20 17#define DESC_SIZE 20
@@ -89,7 +90,7 @@ int do_user_menu(void) {
89 90
90 MENUITEM_STRINGLIST(menu, "Rockboy Menu", NULL, 91 MENUITEM_STRINGLIST(menu, "Rockboy Menu", NULL,
91 "Load Game", "Save Game", 92 "Load Game", "Save Game",
92 "Options", "Quit"); 93 "Options", "Reset", "Quit");
93 94
94 rockboy_pcm_init(); 95 rockboy_pcm_init();
95 96
@@ -108,7 +109,11 @@ int do_user_menu(void) {
108 case 2: /* Options */ 109 case 2: /* Options */
109 do_opt_menu(); 110 do_opt_menu();
110 break; 111 break;
111 case 3: /* Quit */ 112 case 3: /* Reset */
113 emu_reset();
114 done=true;
115 break;
116 case 4: /* Quit */
112 ret = USER_MENU_QUIT; 117 ret = USER_MENU_QUIT;
113 done=true; 118 done=true;
114 break; 119 break;
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index 479fbdb49d..e1d757845f 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -122,5 +122,6 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
122 Pick one of a few predefined colour palettes. 122 Pick one of a few predefined colour palettes.
123 } 123 }
124 \end{description} 124 \end{description}
125\item[Reset.] Resets the Emulator.
125\item[Quit RockBoy.] Quits the Rockboy plugin. 126\item[Quit RockBoy.] Quits the Rockboy plugin.
126\end{description} 127\end{description}