From fe57609c815a9b69d256ecbeb218f7dd29da7c6f Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@feb19cf6-d755-11dd-8179-53c65a4d6d95>
Date: Sat, 16 Jan 2010 12:18:06 +0000
Subject: [PATCH] Add game info and move resetting to options

---
 main_menu.cpp     |  5 +----
 menu_messages.cpp | 14 ++++++++++----
 options_menu.cpp  |  9 ++++++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/main_menu.cpp b/main_menu.cpp
index d88b17e..73d2f90 100644
--- a/main_menu.cpp
+++ b/main_menu.cpp
@@ -1,6 +1,5 @@
 #include "menu.hh"
 #include "dialogue_box.hh"
-#include "status_bar.hh"
 
 class KeyboardTypingListener : public KeyboardListener
 {
@@ -81,9 +80,7 @@ public:
 				panic("Illegal selection\n");
 			}
 			break;
-		case 9: /* Reset the C64 */
-			Gui::gui->status_bar->queueMessage("Resetting the C64");
-			Gui::gui->popView();
+		case 9: /* Game info */
 			break;
 		case 10: /* Networking */
 			Gui::gui->pushView(Gui::gui->nv);
diff --git a/menu_messages.cpp b/menu_messages.cpp
index 3d70dc9..7272b2f 100644
--- a/menu_messages.cpp
+++ b/menu_messages.cpp
@@ -69,7 +69,7 @@ const char **main_menu_messages = (const char*[]){
 	/*06*/          "Keyboard",
 	/*07*/          "^|Type|Macro|Bind",
 	/*08*/          " ",
-	/*09*/          "Reset the C=64",
+	/*09*/          "Game info",
 	/*10*/          "Networking",
 	/*11*/          "Options",
 	/*12*/          "Quit",
@@ -106,7 +106,12 @@ const char **main_menu_help[] = {
 		},
 		NULL,
 		NULL,
-		NULL,
+		(const char*[]){
+				"View and configure game",
+				"information (author,",
+				"screenshots etc)",
+				NULL,
+		},
 		(const char*[]){
 				"Network setup for playing",
 				"C64 games against other",
@@ -136,8 +141,9 @@ const char **options_menu_messages = (const char*[]){
                 /*07*/          "^|double-center|stretched",
                 /*08*/          "Speed (approx. %)",
                 /*09*/          "^|95|100|110",
-                /*10*/          " ",
-                /*11*/          "Setup GUI theme",
+        	/*10*/          "Reset the C=64",
+                /*11*/          " ",
+                /*12*/          "Setup GUI theme",
                 NULL
 };
 
diff --git a/options_menu.cpp b/options_menu.cpp
index 8d30cee..f6329bf 100644
--- a/options_menu.cpp
+++ b/options_menu.cpp
@@ -1,6 +1,7 @@
 #include "gui.hh"
 #include "menu.hh"
 #include "help_box.hh"
+#include "status_bar.hh"
 
 class OptionsView;
 class OptionsMenu : public Menu
@@ -20,8 +21,14 @@ public:
 
 	virtual void selectCallback(int which)
 	{
+		if (which == 9) /* Game info */
+		{
+			Gui::gui->status_bar->queueMessage("Resetting the C64");
+			Gui::gui->popView();
+			return;
+		}
 		/* Select theme */
-		if (which == 11)
+		if (which == 12)
 		{
 			Gui::gui->tv->setDirectory(Gui::gui->theme_base_path);
 			Gui::gui->pushView(Gui::gui->tv);