projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New settings tab contain all possible settings
[oweals/minetest.git]
/
src
/
guiKeyChangeMenu.h
diff --git
a/src/guiKeyChangeMenu.h
b/src/guiKeyChangeMenu.h
index 833514c1d98d2e8478d86afb6d614294bec4d49d..19a07620d242c2804418b3c488dcddf2d062139f 100644
(file)
--- a/
src/guiKeyChangeMenu.h
+++ b/
src/guiKeyChangeMenu.h
@@
-30,13
+30,13
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
-
typedef struct
{
+
struct key_setting
{
int id;
int id;
- wchar_t *button_name;
+
const
wchar_t *button_name;
KeyPress key;
std::string setting_name;
gui::IGUIButton *button;
KeyPress key;
std::string setting_name;
gui::IGUIButton *button;
-}
key_setting
;
+};
class GUIKeyChangeMenu: public GUIModalMenu
class GUIKeyChangeMenu: public GUIModalMenu
@@
-64,7
+64,7
@@
private:
bool resetMenu();
bool resetMenu();
- void add_key(int id,
wchar_t* button_name, std::string
setting_name);
+ void add_key(int id,
const wchar_t *button_name, const std::string &
setting_name);
bool shift_down;
bool shift_down;