Index: src/ActionButton.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ActionButton.cc,v
retrieving revision 1.21
diff -u -r1.21 ActionButton.cc
--- src/ActionButton.cc	2001/12/04 12:18:49	1.21
+++ src/ActionButton.cc	2001/12/06 03:01:39
@@ -195,7 +195,8 @@
 
   // print the action name under the button, when mouse pointer is 
   // on the button.
-  if(CL_Mouse::get_x() > x_pos && CL_Mouse::get_x() < x_pos + 37
+  if(action_help
+     && CL_Mouse::get_x() > x_pos && CL_Mouse::get_x() < x_pos + 37
      && CL_Mouse::get_y() < y_pos + 55 && CL_Mouse::get_y() > y_pos) 
   {
 	font_b->print_left( x_pos, y_pos + 56, name.c_str());
@@ -265,7 +266,8 @@
 
   // print the action name next to the button, when mouse pointer is on
   // the button.
-  if(CL_Mouse::get_x() > x_pos && CL_Mouse::get_x() < x_pos + 60
+  if(action_help 
+     && CL_Mouse::get_x() > x_pos && CL_Mouse::get_x() < x_pos + 60
      && CL_Mouse::get_y() < y_pos + 35 && CL_Mouse::get_y() > y_pos) 
   {
 	font_b->print_left (61, y_pos, name.c_str());
Index: src/OptionMenu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/OptionMenu.cc,v
retrieving revision 1.37
diff -u -r1.37 OptionMenu.cc
--- src/OptionMenu.cc	2001/12/05 09:15:50	1.37
+++ src/OptionMenu.cc	2001/12/06 03:01:41
@@ -226,6 +226,7 @@
   //add_entry(_("Debug GameTime"), &debug_game_time);
   //add_entry(_("Debug Tiles"), &debug_tiles);
   add_entry(_("Auto Scrolling"), &auto_scrolling);
+  add_entry(_("Action Help Strings"), &action_help);
 }
 
 void
Index: src/PingusMain.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMain.cc,v
retrieving revision 1.46
diff -u -r1.46 PingusMain.cc
--- src/PingusMain.cc	2001/12/05 09:15:51	1.46
+++ src/PingusMain.cc	2001/12/06 03:01:46
@@ -195,6 +195,8 @@
       {"disable-fullscreen",no_argument,       0, 'F'},
       {"disable-swcursor",  no_argument,       0, 145},
       {"enable-swcursor",   no_argument,       0, 146},
+      {"disable-action-help",no_argument,      0, 156},
+      {"enable-action-help", no_argument,      0, 157},
       {"enable-bg-manipulation", no_argument,  0, 148},
       {"use-datafile",      no_argument,       0, 150},
       {"use-scriptfile",    no_argument,       0, 151},
@@ -482,6 +484,13 @@
     case 155:
       broken_clanlib_resource_handling = true;
       break;
+    case 156:
+      action_help = false;
+      break;
+
+    case 157:
+      action_help = true;
+      break;
 
     default:
       if (verbose) std::cout << _("Unknow char: ") << c << std::endl << std::endl;
@@ -516,6 +525,8 @@
 	"   --disable-auto-scrolling Disable automatic scrolling\n"
 	"   --disable-swcursor       Disable software cursor, use hw cursor instead\n"
 	"   --enable-swcursor        Enable software cursor\n"
+	"   --disable-action-help    Disable action button help strings\n"
+	"   --enable-action-help     Enable action button help strings(default)\n"
 	"   --no-cfg-file            Don't read ~/.pingus/config\n"
 	"   --config-file FILE       Read config from FILE (default: ~/.pingus/config)\n"
 	"   --max-cpu-usage          Use all of the cpu power available, instead of trying to\n"
Index: src/globals.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/globals.cc,v
retrieving revision 1.35
diff -u -r1.35 globals.cc
--- src/globals.cc	2001/12/02 21:43:48	1.35
+++ src/globals.cc	2001/12/06 03:01:47
@@ -53,6 +53,7 @@
 float  frame_skip = 1.0f;     /// --frame-skip
 bool   use_opengl = false;
 bool   broken_clanlib_resource_handling = false;
+bool   action_help = true;
 
 std::string global_username;
 std::string global_email; 
Index: src/globals.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/globals.hh,v
retrieving revision 1.33
diff -u -r1.33 globals.hh
--- src/globals.hh	2001/12/02 21:43:48	1.33
+++ src/globals.hh	2001/12/06 03:01:47
@@ -61,6 +61,7 @@
 extern float  frame_skip;     /// --frame-skip
 extern bool   use_opengl;     /// --use-opengl
 extern bool   broken_clanlib_resource_handling;
+extern bool   action_help;  /// --action-help
 
 /// The name of the currently logged in user
 extern std::string global_username;

