- 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 b177878..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"
@@ -157,43 +158,47 @@ void Menu::get_controlfield_key_into_input(MenuItem *item)
   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;
   }
 }
@@ -222,8 +227,6 @@ Menu::Menu()
   
   pos_x        = screen->w/2;
   pos_y        = screen->h/2;
-  has_backitem = false;
-  last_id = 0;
   arrange_left = 0;
   active_item  = 0;
   effect.init(false);
@@ -238,15 +241,6 @@ 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 id, int* int_p)
 {
-  if(kind_ == MN_BACK)
-    has_backitem = true;
-  
-  if(id == -1 && item.size() == (unsigned)last_id)
-    {
-    id = last_id;
-    last_id++;
-    }
-
   additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, id, int_p));
 }
 
@@ -254,9 +248,6 @@ Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* m
 void
 Menu::additem(MenuItem* pmenu_item)
 {
-  if(pmenu_item->kind == MN_BACK)
-    has_backitem = true;
-
   item.push_back(*pmenu_item);
   delete pmenu_item;
 }