X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.hpp;h=d6455bd77be227997b8aa49a8dd445bb183013ee;hb=7a4e098cbbb91defffd9d52bb3da86e4c893636d;hp=5e85fa1abd8fbaa109645ac1318035b847c70960;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp index 5e85fa1ab..d6455bd77 100644 --- a/src/gui/menu.hpp +++ b/src/gui/menu.hpp @@ -51,7 +51,7 @@ enum MenuItemKind { }; class Menu; - + class MenuItem { public: @@ -84,11 +84,12 @@ private: /// keyboard key or joystick button bool input_flickering; }; - + class Menu { private: static std::vector last_menus; + static Menu* previous; static Menu* current_; static void pop_current(); @@ -193,7 +194,8 @@ protected: private: void check_controlfield_change_event(const SDL_Event& event); void draw_item(DrawingContext& context, int index); - float effect_time; + float effect_progress; + float effect_start_time; int arrange_left; int active_item;