gave the Yeti hitpoints and Matze's angry roar :)

[supertux.git] / lib / gui / menu.cpp

diff --git a/lib/gui/menu.cpp b/lib/gui/menu.cpp
index 8842b77..83c1664 100644 (file)
--- a/lib/gui/menu.cpp
+++ b/lib/gui/menu.cpp
@@ -18,6 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef WIN32
+#include <config.h>
+
 #include <sys/types.h>
 #include <ctype.h>
 #endif
@@ -29,14 +31,13 @@
 #include <string>
 #include <cassert>
 
-#include "../app/globals.h"
-#include "../gui/menu.h"
-#include "../video/screen.h"
-#include "../video/drawing_context.h"
-#include "../app/setup.h"
-#include "../special/timer.h"
-#include "../app/gettext.h"
-#include "../math/vector.h"
+#include "app/globals.h"
+#include "menu.h"
+#include "video/screen.h"
+#include "video/drawing_context.h"
+#include "app/setup.h"
+#include "app/gettext.h"
+#include "math/vector.h"
 
 using namespace SuperTux;
 
@@ -152,14 +153,14 @@ Menu::set_current(Menu* menu)
   current_ = menu;
 }
 
-MenuItem::MenuItem(MenuItemKind _kind, int _id) : kind(_kind) , id(_id)
+MenuItem::MenuItem(MenuItemKind _kind, int _id)
+  : kind(_kind) , id(_id)
 {
-  list.second = 0;
 }
 
-MenuItem::MenuItem(MenuItemKind _kind, int _id, const std::string& _text) : kind(_kind) , id(_id) , text(_text)
+MenuItem::MenuItem(MenuItemKind _kind, int _id, const std::string& _text) 
+  : kind(_kind) , id(_id) , text(_text)
 {
-  list.second = 0;
 }
 
 /* Return a pointer to a new menu item */
@@ -178,8 +179,8 @@ MenuItem::create(MenuItemKind kind_, const std::string& text_, int init_toggle_,
   pnew_item->target_menu = target_menu_;
 
   pnew_item->int_p = int_p_;
-  
-  pnew_item->list.second = 0;
+
+  pnew_item->selected = 0;
 
   pnew_item->input_flickering = false;
   pnew_item->input_flickering_timer.init(true);
@@ -286,19 +287,10 @@ void Menu::get_controlfield_js_into_input(MenuItem *item)
   item->change_input(oss.str().c_str());
 }
 
-/* Free a menu and all its items */
 Menu::~Menu()
 {
-  if(item.size() != 0)
-    {
-      for(unsigned int i = 0; i < item.size(); ++i)
-        {
-          item[i].list.first.clear();
-        }
-    }
 }
 
-
 Menu::Menu()
 {
   hit_item = -1;
@@ -306,8 +298,8 @@ Menu::Menu()
   delete_character = 0;
   mn_input_char = '\0';
 
-  pos_x        = screen->w/2;
-  pos_y        = screen->h/2;
+  pos_x        = SCREEN_WIDTH/2;
+  pos_y        = SCREEN_HEIGHT/2;
   arrange_left = 0;
   active_item  = 0;
   effect.init(false);
@@ -355,6 +347,7 @@ void
 Menu::clear()
 {
   item.clear();
+  active_item = 0;
 }
 
 /* Process actions done on the menu */
@@ -394,25 +387,21 @@ Menu::action()
           break;
 
         case MENU_ACTION_LEFT:
-          if(item[active_item].kind == MN_STRINGSELECT
-              && item[active_item].list.first.size() != 0)
-            {
-              if(item[active_item].list.second != item[active_item].list.first.begin())
-                --item[active_item].list.second;
-              else
-                item[active_item].list.second = item[active_item].list.first.end();
-            }
+          if(item[active_item].kind == MN_STRINGSELECT) {
+            if(item[active_item].selected > 0)
+              item[active_item].selected--;
+            else
+              item[active_item].selected = item[active_item].list.size()-1;
+          }
           break;
 
         case MENU_ACTION_RIGHT:
-          if(item[active_item].kind == MN_STRINGSELECT
-              && item[active_item].list.first.size() != 0)
-            {
-              if(item[active_item].list.second != item[active_item].list.first.end())
-                ++item[active_item].list.second;
-              else
-                item[active_item].list.second = item[active_item].list.first.begin();
-            }
+          if(item[active_item].kind == MN_STRINGSELECT) {
+            if(item[active_item].selected+1 < item[active_item].list.size())
+              item[active_item].selected++;
+            else
+              item[active_item].selected = 0;
+          }
           break;
 
         case MENU_ACTION_HIT:
@@ -519,9 +508,9 @@ Menu::draw_item(DrawingContext& context,
   int text_width  = int(text_font->get_text_width(pitem.text));
   int input_width = int(text_font->get_text_width(pitem.input) + 10);
   int list_width = 0;
-  std::set<std::string>::iterator tmp = 0;
-  if(pitem.list.second != tmp)
-  list_width = int(text_font->get_text_width((*pitem.list.second)));
+  if(pitem.list.size() > 0) {
+    list_width = (int) text_font->get_text_width(pitem.list[pitem.selected]);
+  }
   
   if (arrange_left)
     x_pos += 24 - menu_width/2 + (text_width + input_width + list_width)/2;
@@ -537,7 +526,7 @@ Menu::draw_item(DrawingContext& context,
     case MN_DEACTIVE:
       {
         context.draw_text(deactive_font, pitem.text,
-                          Vector(screen->w/2, y_pos - int(deactive_font->get_height()/2)),
+                          Vector(SCREEN_WIDTH/2, y_pos - int(deactive_font->get_height()/2)),
                           CENTER_ALLIGN, LAYER_GUI);
         break;
       }
@@ -557,7 +546,7 @@ Menu::draw_item(DrawingContext& context,
     case MN_LABEL:
       {
         context.draw_text(label_font, pitem.text,
-                          Vector(screen->w/2, y_pos - int(label_font->get_height()/2)),
+                          Vector(SCREEN_WIDTH/2, y_pos - int(label_font->get_height()/2)),
                           CENTER_ALLIGN, LAYER_GUI);
         break;
       }
@@ -567,7 +556,7 @@ Menu::draw_item(DrawingContext& context,
     case MN_CONTROLFIELD_JS:
       {
         int width = text_width + input_width + 5;
-        int text_pos = screen->w/2 - width/2;
+        int text_pos = SCREEN_WIDTH/2 - width/2;
         int input_pos = text_pos + text_width + 10;
 
         context.draw_filled_rect(
@@ -631,18 +620,18 @@ Menu::draw_item(DrawingContext& context,
           Vector(list_pos_2, 18),
           Color(0,0,0,128), LAYER_GUI - 5);
 
-        context.draw_text(text_font, (*pitem.list.second),
-                                 Vector(screen->w/2 + text_pos, y_pos - int(text_font->get_height()/2)),
+        context.draw_text(text_font, pitem.list[pitem.selected],
+                                 Vector(SCREEN_WIDTH/2 + text_pos, y_pos - int(text_font->get_height()/2)),
                                  CENTER_ALLIGN, LAYER_GUI);
         context.draw_text(text_font, pitem.text,
-                                 Vector(screen->w/2  + list_pos_2/2, y_pos - int(text_font->get_height()/2)),
+                                 Vector(SCREEN_WIDTH/2  + list_pos_2/2, y_pos - int(text_font->get_height()/2)),
                                  CENTER_ALLIGN, LAYER_GUI);
         break;
       }
     case MN_BACK:
       {
         context.draw_text(text_font, pitem.text,
-                          Vector(screen->w/2, y_pos - int(text_font->get_height()/2)),
+                          Vector(SCREEN_WIDTH/2, y_pos - int(text_font->get_height()/2)),
                           CENTER_ALLIGN, LAYER_GUI);
         context.draw_surface(back,
                              Vector(x_pos + text_width/2  + 16, y_pos - 8),
@@ -653,7 +642,7 @@ Menu::draw_item(DrawingContext& context,
     case MN_TOGGLE:
       {
         context.draw_text(text_font, pitem.text,
-                          Vector(screen->w/2, y_pos - (text_font->get_height()/2)),
+                          Vector(SCREEN_WIDTH/2, y_pos - (text_font->get_height()/2)),
                           CENTER_ALLIGN, LAYER_GUI);
 
         if(pitem.toggled)
@@ -668,13 +657,13 @@ Menu::draw_item(DrawingContext& context,
       }
     case MN_ACTION:
       context.draw_text(text_font, pitem.text,
-                        Vector(screen->w/2, y_pos - int(text_font->get_height()/2)),
+                        Vector(SCREEN_WIDTH/2, y_pos - int(text_font->get_height()/2)),
                         CENTER_ALLIGN, LAYER_GUI);
       break;
 
     case MN_GOTO:
       context.draw_text(text_font, pitem.text,
-                        Vector(screen->w/2, y_pos - int(text_font->get_height()/2)),
+                        Vector(SCREEN_WIDTH/2, y_pos - int(text_font->get_height()/2)),
                         CENTER_ALLIGN, LAYER_GUI);
       break;
     }
@@ -687,7 +676,7 @@ int Menu::get_width() const
     int menu_width = 0;
     for(unsigned int i = 0; i < item.size(); ++i)
       {
-        int w = item[i].text.size() + item[i].input.size() + 1; //+ ((item[i].list.second != item[i].list.first.end()) ? (strlen((*(item[i].list.second)).c_str())) : 0);
+        int w = item[i].text.size() + item[i].input.size() + 1;
         if( w > menu_width )
           {
             menu_width = w;
@@ -757,7 +746,7 @@ Menu::event(SDL_Event& event)
     {
     case SDL_KEYDOWN:
       {
-        SDLKey key = key = event.key.keysym.sym;
+        SDLKey key = event.key.keysym.sym;
         SDLMod keymod;
         char ch[2];
         keymod = SDL_GetModState();
@@ -870,8 +859,8 @@ Menu::event(SDL_Event& event)
 
     case SDL_MOUSEBUTTONDOWN:
       {
-        int x = event.motion.x;
-        int y = event.motion.y;
+        int x = int(event.motion.x * float(SCREEN_WIDTH)/screen->w);
+        int y = int(event.motion.y * float(SCREEN_HEIGHT)/screen->h);
 
         if(x > pos_x - get_width()/2 &&
             x < pos_x + get_width()/2 &&
@@ -885,8 +874,8 @@ Menu::event(SDL_Event& event)
 
     case SDL_MOUSEMOTION:
       {
-        int x = event.motion.x;
-        int y = event.motion.y;
+        int x = int(event.motion.x * float(SCREEN_WIDTH)/screen->w);
+        int y = int(event.motion.y * float(SCREEN_HEIGHT)/screen->h);
 
         if(x > pos_x - get_width()/2 &&
             x < pos_x + get_width()/2 &&
@@ -917,5 +906,3 @@ Menu::event(SDL_Event& event)
     }
 }
 
-
-// EOF //