- removed joystick setup menu, since it won't work anyway

[supertux.git] / src / menu.cpp

diff --git a/src/menu.cpp b/src/menu.cpp
index db41fce..b8c41e9 100644 (file)
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 #include "defines.h"
 #include "globals.h"
@@ -98,7 +99,7 @@ Menu::set_current(Menu* menu)
 
 /* Return a pointer to a new menu item */
 MenuItem*
-MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu* target_menu_, int* int_p_)
+MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu* target_menu_, int id, int* int_p_)
 {
   MenuItem *pnew_item = new MenuItem;
   
@@ -123,6 +124,7 @@ MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu*
   else
     pnew_item->list = NULL;
 
+  pnew_item->id = id;
   pnew_item->int_p = int_p_;
 
   return pnew_item;
@@ -153,46 +155,50 @@ MenuItem::change_input(const  char *text_)
 /* Set ControlField a key */
 void Menu::get_controlfield_key_into_input(MenuItem *item)
 {
-switch(*item->int_p)
+  switch(*item->int_p)
   {
   case SDLK_UP:
-    strcpy(item->input, "Up cursor");
+    item->change_input("Up cursor");
     break;
   case SDLK_DOWN:
-    strcpy(item->input, "Down cursor");
+    item->change_input("Down cursor");
     break;
   case SDLK_LEFT:
-    strcpy(item->input, "Left cursor");
+    item->change_input("Left cursor");
     break;
   case SDLK_RIGHT:
-    strcpy(item->input, "Right cursor");
+    item->change_input("Right cursor");
     break;
   case SDLK_RETURN:
-    strcpy(item->input, "Return");
+    item->change_input("Return");
     break;
   case SDLK_SPACE:
-    strcpy(item->input, "Space");
+    item->change_input("Space");
     break;
   case SDLK_RSHIFT:
-    strcpy(item->input, "Right Shift");
+    item->change_input("Right Shift");
     break;
   case SDLK_LSHIFT:
-    strcpy(item->input, "Left Shift");
+    item->change_input("Left Shift");
     break;
   case SDLK_RCTRL:
-    strcpy(item->input, "Right Control");
+    item->change_input("Right Control");
     break;
   case SDLK_LCTRL:
-    strcpy(item->input, "Left Control");
+    item->change_input("Left Control");
     break;
   case SDLK_RALT:
-    strcpy(item->input, "Right Alt");
+    item->change_input("Right Alt");
     break;
   case SDLK_LALT:
-    strcpy(item->input, "Left Alt");
+    item->change_input("Left Alt");
     break;
   default:
-    strcpy(item->input, (char*)item->int_p);
+    {
+      char tmp[64];
+      snprintf(tmp, 64, "%d", *item->int_p);
+      item->change_input(tmp);
+    }
     break;
   }
 }
@@ -221,7 +227,6 @@ Menu::Menu()
   
   pos_x        = screen->w/2;
   pos_y        = screen->h/2;
-  has_backitem = false;
   arrange_left = 0;
   active_item  = 0;
   effect.init(false);
@@ -234,21 +239,15 @@ void Menu::set_pos(int x, int y, float rw, float rh)
 }
 
 void
-Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* menu_, int* int_p)
+Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* menu_, int id, int* int_p)
 {
-  if(kind_ == MN_BACK)
-    has_backitem = true;
-
-  additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, int_p));
+  additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, id, int_p));
 }
 
 /* Add an item to a menu */
 void
 Menu::additem(MenuItem* pmenu_item)
 {
-  if(pmenu_item->kind == MN_BACK)
-    has_backitem = true;
-
   item.push_back(*pmenu_item);
   delete pmenu_item;
 }
@@ -396,30 +395,10 @@ Menu::action()
 int
 Menu::check()
 {
-  return hit_item;
-  /*
-  if (item.size() != 0)
-    {
-      if((item[active_item].kind == MN_ACTION
-          || item[active_item].kind == MN_TEXTFIELD
-          || item[active_item].kind == MN_NUMFIELD)
-          && item[active_item].toggled)
-        { 
-          item[active_item].toggled = false;
-          Menu::set_current(0);
-          return active_item;
-        }
-      else if(item[active_item].kind == MN_TOGGLE 
-              || item[active_item].kind == MN_GOTO)
-        {
-          return active_item;
-        }
-      else
-        return -1;
-    }
+  if (hit_item != -1)
+    return item[hit_item].id;
   else
     return -1;
-  */
 }
 
 void
@@ -614,6 +593,25 @@ Menu::draw()
     }
 }
 
+MenuItem&
+Menu::get_item_by_id(int id)
+{
+  for(std::vector<MenuItem>::iterator i = item.begin(); i != item.end(); ++i) {
+    if(i->id == id)
+      return *i;
+  }
+
+  assert(false);
+  static MenuItem dummyitem;
+  return dummyitem;
+}
+
+bool
+Menu::isToggled(int id)
+{
+  return get_item_by_id(id).toggled;
+}
+
 /* Check for menu event */
 void
 Menu::event(SDL_Event& event)