[Super-tux-commit] supertux/src menu.cpp,1.50,1.51 menu.h,1.43,1.44 setup.cpp,1.49,1.50

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12905/src

Modified Files:
	menu.cpp menu.h setup.cpp 
Log Message:
Added a joystick control dialog.
I don't have a joystick, so please test and improve this thing. Thx.

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- menu.cpp	22 Apr 2004 20:44:11 -0000	1.50
+++ menu.cpp	23 Apr 2004 11:12:43 -0000	1.51
@@ -48,7 +48,8 @@
 Menu* game_menu      = 0;
 Menu* worldmap_menu  = 0;
 Menu* options_menu   = 0;
-Menu* options_controls_menu   = 0;
+Menu* options_keys_menu     = 0;
+Menu* options_joystick_menu = 0;
 Menu* highscore_menu = 0;
 Menu* load_game_menu = 0;
 Menu* save_game_menu = 0;

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- setup.cpp	22 Apr 2004 20:45:22 -0000	1.49
+++ setup.cpp	23 Apr 2004 11:12:43 -0000	1.50
@@ -365,7 +365,8 @@
 {
   main_menu      = new Menu();
   options_menu   = new Menu();
-  options_controls_menu   = new Menu();
+  options_keys_menu     = new Menu();
+  options_joystick_menu = new Menu();
   load_game_menu = new Menu();
   save_game_menu = new Menu();
   game_menu      = new Menu();
@@ -401,20 +402,36 @@
       options_menu->additem(MN_DEACTIVE,"Music     ",use_music,0);
     }
   options_menu->additem(MN_TOGGLE,"Show FPS  ",show_fps,0);
-  options_menu->additem(MN_GOTO,"Controls  ",0,options_controls_menu);
+  options_menu->additem(MN_GOTO,"Key Setup  ",0,options_keys_menu);
+  if(use_joystick)
+    options_menu->additem(MN_GOTO,"Joystick Setup  ",0,options_joystick_menu);
   options_menu->additem(MN_HL,"",0,0);
   options_menu->additem(MN_BACK,"Back",0,0);
   
-  options_controls_menu->additem(MN_LABEL,"Controls",0,0);
-  options_controls_menu->additem(MN_HL,"",0,0);
-  options_controls_menu->additem(MN_CONTROLFIELD,"Left move", 0,0, &keymap.left);
-  options_controls_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, &keymap.right);
-  options_controls_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, &keymap.jump);
-  options_controls_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, &keymap.duck);
-  options_controls_menu->additem(MN_CONTROLFIELD,"Power", 0,0, &keymap.fire);
-  options_controls_menu->additem(MN_HL,"",0,0);
-  options_controls_menu->additem(MN_BACK,"Back",0,0);
+  options_keys_menu->additem(MN_LABEL,"Key Setup",0,0);
+  options_keys_menu->additem(MN_HL,"",0,0);
+  options_keys_menu->additem(MN_CONTROLFIELD,"Left move", 0,0, &keymap.left);
+  options_keys_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, &keymap.right);
+  options_keys_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, &keymap.jump);
+  options_keys_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, &keymap.duck);
+  options_keys_menu->additem(MN_CONTROLFIELD,"Power", 0,0, &keymap.fire);
+  options_keys_menu->additem(MN_HL,"",0,0);
+  options_keys_menu->additem(MN_BACK,"Back",0,0);
 
+  if(use_joystick)
+    {
+    options_joystick_menu->additem(MN_LABEL,"Joystick Setup",0,0);
+    options_joystick_menu->additem(MN_HL,"",0,0);
+    options_joystick_menu->additem(MN_CONTROLFIELD,"X axis", 0,0, &joystick_keymap.x_axis);
+    options_joystick_menu->additem(MN_CONTROLFIELD,"Y axis", 0,0, &joystick_keymap.y_axis);
+    options_joystick_menu->additem(MN_CONTROLFIELD,"A button", 0,0, &joystick_keymap.a_button);
+    options_joystick_menu->additem(MN_CONTROLFIELD,"B button", 0,0, &joystick_keymap.b_button);
+    options_joystick_menu->additem(MN_CONTROLFIELD,"Start", 0,0, &joystick_keymap.start_button);
+    options_joystick_menu->additem(MN_CONTROLFIELD,"DeadZone", 0,0, &joystick_keymap.dead_zone);
+    options_joystick_menu->additem(MN_HL,"",0,0);
+    options_joystick_menu->additem(MN_BACK,"Back",0,0);
+    }
+  
   load_game_menu->additem(MN_LABEL,"Start Game",0,0);
   load_game_menu->additem(MN_HL,"",0,0);
   load_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0);

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- menu.h	22 Apr 2004 18:39:52 -0000	1.43
+++ menu.h	23 Apr 2004 11:12:43 -0000	1.44
@@ -155,7 +155,8 @@
 extern Menu* game_menu;
 extern Menu* worldmap_menu;
 extern Menu* options_menu;
-extern Menu* options_controls_menu;
+extern Menu* options_keys_menu;
+extern Menu* options_joystick_menu;
 extern Menu* highscore_menu;
 extern Menu* load_game_menu;
 extern Menu* save_game_menu;