projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make some tiles (top of pipes, top of snowbg) unisolid as that feels better in levels...
[supertux.git]
/
src
/
gui
/
menu.h
diff --git
a/src/gui/menu.h
b/src/gui/menu.h
index
46373b4
..
dba01bc
100644
(file)
--- a/
src/gui/menu.h
+++ b/
src/gui/menu.h
@@
-29,7
+29,6
@@
#include "video/surface.h"
#include "video/font.h"
#include "video/surface.h"
#include "video/font.h"
-#include "special/timer.h"
#include "mousecursor.h"
bool confirm_dialog(Surface* background, std::string text);
#include "mousecursor.h"
bool confirm_dialog(Surface* background, std::string text);
@@
-82,7
+81,6
@@
private:
/// keyboard key or joystick button
bool input_flickering;
/// keyboard key or joystick button
bool input_flickering;
- Timer input_flickering_timer;
};
class Menu
};
class Menu
@@
-132,7
+130,7
@@
private:
/* input implementation variables */
int delete_character;
char mn_input_char;
/* input implementation variables */
int delete_character;
char mn_input_char;
-
Timer repeat_timer
;
+
Uint32 menu_repeat_ticks
;
public:
static Font* default_font;
public:
static Font* default_font;
@@
-192,7
+190,7
@@
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);
-
Timer effect
;
+
Uint32 effect_ticks
;
int arrange_left;
int active_item;
};
int arrange_left;
int active_item;
};