X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.h;h=f3e621e7689ce139a5fb6ae23a8d001b13fa6bda;hb=81931e4d4dae892ed8ba9f4e40da335881b93484;hp=46373b45b635e1b7b0b74264e719bd18d4f6ad0f;hpb=eba5f4b45f92cb19a09fbac1a478648062480adb;p=supertux.git

diff --git a/src/gui/menu.h b/src/gui/menu.h
index 46373b45b..f3e621e76 100644
--- a/src/gui/menu.h
+++ b/src/gui/menu.h
@@ -29,7 +29,6 @@
 
 #include "video/surface.h"
 #include "video/font.h"
-#include "special/timer.h"
 #include "mousecursor.h"
 
 bool confirm_dialog(Surface* background, std::string text);
@@ -82,7 +81,6 @@ private:
 
   /// keyboard key or joystick button
   bool input_flickering;
-  Timer input_flickering_timer;
 };
 
 class Menu
@@ -119,7 +117,7 @@ private:
   };
   
   /** Number of the item that got 'hit' (ie. pressed) in the last
-      event()/action() call, -1 if none */
+      event()/update() call, -1 if none */
   int hit_item;
   
   // position of the menu (ie. center of the menu, not top/left)
@@ -132,7 +130,7 @@ private:
   /* input implementation variables */
   int delete_character;
   char mn_input_char;
-  Timer repeat_timer;
+  Uint32 menu_repeat_ticks;
 
 public:
   static Font* default_font;
@@ -158,7 +156,7 @@ public:
 
   virtual void menu_action(MenuItem* item);
   
-  void action();
+  void update();
   
   /** Remove all entries from the menu */
   void clear();
@@ -192,7 +190,7 @@ protected:
 private:
   void check_controlfield_change_event(const SDL_Event& event);  
   void draw_item(DrawingContext& context, int index);
-  Timer effect;
+  Uint32 effect_ticks;
   int arrange_left;
   int active_item;
 };