Add game info and move resetting to options

This commit is contained in:
simon.kagstrom 2010-01-16 12:18:06 +00:00
parent 1745a49933
commit fe57609c81
3 changed files with 19 additions and 9 deletions

View File

@ -1,6 +1,5 @@
#include "menu.hh" #include "menu.hh"
#include "dialogue_box.hh" #include "dialogue_box.hh"
#include "status_bar.hh"
class KeyboardTypingListener : public KeyboardListener class KeyboardTypingListener : public KeyboardListener
{ {
@ -81,9 +80,7 @@ public:
panic("Illegal selection\n"); panic("Illegal selection\n");
} }
break; break;
case 9: /* Reset the C64 */ case 9: /* Game info */
Gui::gui->status_bar->queueMessage("Resetting the C64");
Gui::gui->popView();
break; break;
case 10: /* Networking */ case 10: /* Networking */
Gui::gui->pushView(Gui::gui->nv); Gui::gui->pushView(Gui::gui->nv);

View File

@ -69,7 +69,7 @@ const char **main_menu_messages = (const char*[]){
/*06*/ "Keyboard", /*06*/ "Keyboard",
/*07*/ "^|Type|Macro|Bind", /*07*/ "^|Type|Macro|Bind",
/*08*/ " ", /*08*/ " ",
/*09*/ "Reset the C=64", /*09*/ "Game info",
/*10*/ "Networking", /*10*/ "Networking",
/*11*/ "Options", /*11*/ "Options",
/*12*/ "Quit", /*12*/ "Quit",
@ -106,7 +106,12 @@ const char **main_menu_help[] = {
}, },
NULL, NULL,
NULL, NULL,
NULL, (const char*[]){
"View and configure game",
"information (author,",
"screenshots etc)",
NULL,
},
(const char*[]){ (const char*[]){
"Network setup for playing", "Network setup for playing",
"C64 games against other", "C64 games against other",
@ -136,8 +141,9 @@ const char **options_menu_messages = (const char*[]){
/*07*/ "^|double-center|stretched", /*07*/ "^|double-center|stretched",
/*08*/ "Speed (approx. %)", /*08*/ "Speed (approx. %)",
/*09*/ "^|95|100|110", /*09*/ "^|95|100|110",
/*10*/ " ", /*10*/ "Reset the C=64",
/*11*/ "Setup GUI theme", /*11*/ " ",
/*12*/ "Setup GUI theme",
NULL NULL
}; };

View File

@ -1,6 +1,7 @@
#include "gui.hh" #include "gui.hh"
#include "menu.hh" #include "menu.hh"
#include "help_box.hh" #include "help_box.hh"
#include "status_bar.hh"
class OptionsView; class OptionsView;
class OptionsMenu : public Menu class OptionsMenu : public Menu
@ -20,8 +21,14 @@ public:
virtual void selectCallback(int which) virtual void selectCallback(int which)
{ {
if (which == 9) /* Game info */
{
Gui::gui->status_bar->queueMessage("Resetting the C64");
Gui::gui->popView();
return;
}
/* Select theme */ /* Select theme */
if (which == 11) if (which == 12)
{ {
Gui::gui->tv->setDirectory(Gui::gui->theme_base_path); Gui::gui->tv->setDirectory(Gui::gui->theme_base_path);
Gui::gui->pushView(Gui::gui->tv); Gui::gui->pushView(Gui::gui->tv);