- added new extro background

[supertux.git] / src / menu.cpp

diff --git a/src/menu.cpp b/src/menu.cpp
index 14834c1..bbf1561 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"
@@ -48,7 +49,8 @@ Menu* main_menu      = 0;
 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;
@@ -97,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_)
+MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu* target_menu_, int id, int* int_p_)
 {
   MenuItem *pnew_item = new MenuItem;
   
@@ -121,6 +123,10 @@ 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;
 }
 
@@ -146,6 +152,53 @@ MenuItem::change_input(const  char *text_)
     }
 }
 
+/* Set ControlField a key */
+void Menu::get_controlfield_key_into_input(MenuItem *item)
+{
+  switch(*item->int_p)
+  {
+  case SDLK_UP:
+    strcpy(item->input, "Up cursor");
+    break;
+  case SDLK_DOWN:
+    strcpy(item->input, "Down cursor");
+    break;
+  case SDLK_LEFT:
+    strcpy(item->input, "Left cursor");
+    break;
+  case SDLK_RIGHT:
+    strcpy(item->input, "Right cursor");
+    break;
+  case SDLK_RETURN:
+    strcpy(item->input, "Return");
+    break;
+  case SDLK_SPACE:
+    strcpy(item->input, "Space");
+    break;
+  case SDLK_RSHIFT:
+    strcpy(item->input, "Right Shift");
+    break;
+  case SDLK_LSHIFT:
+    strcpy(item->input, "Left Shift");
+    break;
+  case SDLK_RCTRL:
+    strcpy(item->input, "Right Control");
+    break;
+  case SDLK_LCTRL:
+    strcpy(item->input, "Left Control");
+    break;
+  case SDLK_RALT:
+    strcpy(item->input, "Right Alt");
+    break;
+  case SDLK_LALT:
+    strcpy(item->input, "Left Alt");
+    break;
+  default:
+    strcpy(item->input, (char*)item->int_p);
+    break;
+  }
+}
+
 /* Free a menu and all its items */
 Menu::~Menu()
 {
@@ -170,7 +223,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);
@@ -183,21 +235,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_)
+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_));
+  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;
 }
@@ -272,7 +318,6 @@ Menu::action()
               case MN_ACTION:
               case MN_TEXTFIELD:
               case MN_NUMFIELD:
-              case MN_CONTROLFIELD:
                 Menu::set_current(0); 
                 item[active_item].toggled = true;
                 break;
@@ -321,7 +366,6 @@ Menu::action()
                   item[active_item].input[1] = '\0';
                 }
             }
-          break;
 
         case MENU_ACTION_NONE:
           break;
@@ -347,30 +391,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
@@ -378,7 +402,7 @@ Menu::draw_item(int index, // Position of the current item in the menu
                 int menu_width,
                 int menu_height)
 {
-  const MenuItem& pitem = item[index];
+  MenuItem& pitem = item[index];
 
   int font_width  = 16;
   int effect_offset = 0;
@@ -452,6 +476,9 @@ Menu::draw_item(int index, // Position of the current item in the menu
                  input_width + font_width, 18,
                  0,0,0,128);
 
+        if(pitem.kind == MN_CONTROLFIELD)
+          get_controlfield_key_into_input(&pitem);
+
         gold_text->draw_align(pitem.input,
                               x_pos + text_pos, y_pos,
                               A_HMIDDLE, A_VMIDDLE, 2);
@@ -562,6 +589,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)
@@ -588,6 +634,19 @@ Menu::event(SDL_Event& event)
           /* An International Character. */
         }
 
+      if(item[active_item].kind == MN_CONTROLFIELD)
+        {
+        if(key == SDLK_ESCAPE)
+          {
+          Menu::pop_current();
+          return;
+          }
+        *item[active_item].int_p = key;
+        menuaction = MENU_ACTION_DOWN;
+        return;
+        }
+
+
       switch(key)
         {
         case SDLK_UP:          /* Menu Up */