projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Cleanups
[supertux.git]
/
lib
/
gui
/
menu.h
diff --git
a/lib/gui/menu.h
b/lib/gui/menu.h
index
31ad4f9
..
f4a3943
100644
(file)
--- a/
lib/gui/menu.h
+++ b/
lib/gui/menu.h
@@
-21,6
+21,9
@@
#define SUPERTUX_MENU_H
#include <vector>
#define SUPERTUX_MENU_H
#include <vector>
+#include <set>
+#include <string>
+#include <utility>
#include "SDL.h"
#include "SDL.h"
@@
-28,7
+31,6
@@
#include "../video/font.h"
#include "../special/timer.h"
#include "../special/base.h"
#include "../video/font.h"
#include "../special/timer.h"
#include "../special/base.h"
-#include "../special/stringlist.h"
#include "../gui/mousecursor.h"
namespace SuperTux
#include "../gui/mousecursor.h"
namespace SuperTux
@@
-68,7
+70,7
@@
namespace SuperTux
char *input;
int *int_p; // used for setting keys (can be used for more stuff...)
int id; // item id
char *input;
int *int_p; // used for setting keys (can be used for more stuff...)
int id; // item id
- st
ring_list_type*
list;
+ st
d::pair<std::set<std::string>, std::set<std::string>::iterator>
list;
Menu* target_menu;
void change_text (const char *text);
Menu* target_menu;
void change_text (const char *text);