X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FguiKeyChangeMenu.h;h=19a07620d242c2804418b3c488dcddf2d062139f;hb=006ef5b4a5e362eed848ca26b411a8059d74b965;hp=b81866983bc6b5612de9ba2e3217b36d934c19c5;hpb=3e7957512bdb86acb3836c6c1df96e38e05efa3c;p=oweals%2Fminetest.git

diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index b81866983..19a07620d 100644
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -1,8 +1,8 @@
 /*
- Minetest-c55
- Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
- Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
- Copyright (C) 2011 teddydestodes <derkomtur@schattengang.net>
+ Minetest
+ Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+ Copyright (C) 2013 Ciaran Gultnieks <ciaran@ciarang.com>
+ Copyright (C) 2013 teddydestodes <derkomtur@schattengang.net>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
@@ -30,13 +30,13 @@
 #include <string>
 #include <vector>
 
-typedef struct {
+struct key_setting {
 	int id;
-	wchar_t *button_name;
+	const wchar_t *button_name;
 	KeyPress key;
 	std::string setting_name;
 	gui::IGUIButton *button;
-} key_setting;
+};
 
 
 class GUIKeyChangeMenu: public GUIModalMenu
@@ -64,8 +64,10 @@ private:
 
 	bool resetMenu();
 
-	void add_key(int id, std::string setting_name, std::string button_name);
+	void add_key(int id, const wchar_t *button_name, const std::string &setting_name);
 
+	bool shift_down;
+	
 	s32 activeKey;
 	
 	std::vector<KeyPress> key_used;