projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor cleanup, replaced SCREEN_WIDTH/2 with pos_x
[supertux.git]
/
src
/
gui
/
menu.hpp
diff --git
a/src/gui/menu.hpp
b/src/gui/menu.hpp
index
5e85fa1
..
d6455bd
100644
(file)
--- a/
src/gui/menu.hpp
+++ b/
src/gui/menu.hpp
@@
-51,7
+51,7
@@
enum MenuItemKind {
};
class Menu;
};
class Menu;
-
+
\f
class MenuItem
{
public:
class MenuItem
{
public:
@@
-84,11
+84,12
@@
private:
/// keyboard key or joystick button
bool input_flickering;
};
/// keyboard key or joystick button
bool input_flickering;
};
-
+
\f
class Menu
{
private:
static std::vector<Menu*> last_menus;
class Menu
{
private:
static std::vector<Menu*> last_menus;
+ static Menu* previous;
static Menu* current_;
static void pop_current();
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);
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;
int arrange_left;
int active_item;