Revert "Make Lint Happy"

This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.

1 files changed, 129 insertions, 160 deletions

diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index e65a8311c..94fe0074a 100644
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -32,7 +32,7 @@
 #include "settings.h"
 #include <algorithm>
 
-#include "mainmenumanager.h" // for g_gamecallback
+#include "mainmenumanager.h"  // for g_gamecallback
 
 #define KMaxButtonPerColumns 12
 
@@ -40,9 +40,7 @@ extern MainGameCallback *g_gamecallback;
 
 enum
 {
-	GUI_ID_BACK_BUTTON = 101,
-	GUI_ID_ABORT_BUTTON,
-	GUI_ID_SCROLL_BAR,
+	GUI_ID_BACK_BUTTON = 101, GUI_ID_ABORT_BUTTON, GUI_ID_SCROLL_BAR,
 	// buttons
 	GUI_ID_KEY_FORWARD_BUTTON,
 	GUI_ID_KEY_BACKWARD_BUTTON,
@@ -94,8 +92,9 @@ enum
 	GUI_ID_CB_AUTOJUMP,
 };
 
-GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent,
-		s32 id, IMenuManager *menumgr, ISimpleTextureSource *tsrc) :
+GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
+		gui::IGUIElement* parent, s32 id, IMenuManager *menumgr,
+		ISimpleTextureSource *tsrc) :
 		GUIModalMenu(env, parent, id, menumgr),
 		m_tsrc(tsrc)
 {
@@ -115,9 +114,9 @@ GUIKeyChangeMenu::~GUIKeyChangeMenu()
 
 void GUIKeyChangeMenu::removeChildren()
 {
-	const core::list<gui::IGUIElement *> &children = getChildren();
-	core::list<gui::IGUIElement *> children_copy;
-	for (gui::IGUIElement *i : children) {
+	const core::list<gui::IGUIElement*> &children = getChildren();
+	core::list<gui::IGUIElement*> children_copy;
+	for (gui::IGUIElement*i : children) {
 		children_copy.push_back(i);
 	}
 
@@ -132,9 +131,12 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	removeChildren();
 
 	const float s = m_gui_scale;
-	DesiredRect = core::rect<s32>(screensize.X / 2 - 1113 * s / 2,
-			screensize.Y / 2 - 430 * s / 2, screensize.X / 2 + 1113 * s / 2,
-			screensize.Y / 2 + 430 * s / 2);
+	DesiredRect = core::rect<s32>(
+		screensize.X / 2 - 1113 * s / 2,
+		screensize.Y / 2 - 430 * s / 2,
+		screensize.X / 2 + 1113 * s / 2,
+		screensize.Y / 2 + 430 * s / 2
+	);
 	recalculateAbsolutePosition(false);
 
 	v2s32 size = DesiredRect.getSize();
@@ -143,33 +145,32 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect<s32> rect(0, 0, 600 * s, 40 * s);
 		rect += topleft + v2s32(25 * s, 3 * s);
-		// gui::IGUIStaticText *t =
-		const wchar_t *text = wgettext("Keybindings. (If this menu screws up, "
-					       "remove stuff from minetest.conf)");
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		//gui::IGUIStaticText *t =
+		const wchar_t *text = wgettext("Keybindings. (If this menu screws up, remove stuff from minetest.conf)");
+		Environment->addStaticText(text,
+								   rect, false, true, this, -1);
 		delete[] text;
-		// t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
 	// Build buttons
 
 	v2s32 offset(25 * s, 60 * s);
 
-	for (size_t i = 0; i < key_settings.size(); i++) {
+	for(size_t i = 0; i < key_settings.size(); i++)
+	{
 		key_setting *k = key_settings.at(i);
 		{
 			core::rect<s32> rect(0, 0, 150 * s, 20 * s);
 			rect += topleft + v2s32(offset.X, offset.Y);
-			Environment->addStaticText(
-					k->button_name, rect, false, true, this, -1);
+			Environment->addStaticText(k->button_name, rect, false, true, this, -1);
 		}
 
 		{
 			core::rect<s32> rect(0, 0, 100 * s, 30 * s);
 			rect += topleft + v2s32(offset.X + 150 * s, offset.Y - 5 * s);
 			const wchar_t *text = wgettext(k->key.name());
-			k->button = GUIButton::addButton(
-					Environment, rect, m_tsrc, this, k->id, text);
+			k->button = GUIButton::addButton(Environment, rect, m_tsrc, this, k->id, text);
 			delete[] text;
 		}
 		if ((i + 1) % KMaxButtonPerColumns == 0) {
@@ -188,8 +189,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 			core::rect<s32> rect(0, 0, option_w, 30 * s);
 			rect += topleft + v2s32(option_x, option_y);
 			const wchar_t *text = wgettext("\"Special\" = climb down");
-			Environment->addCheckBox(g_settings->getBool("aux1_descends"),
-					rect, this, GUI_ID_CB_AUX1_DESCENDS, text);
+			Environment->addCheckBox(g_settings->getBool("aux1_descends"), rect, this,
+					GUI_ID_CB_AUX1_DESCENDS, text);
 			delete[] text;
 		}
 		offset += v2s32(0, 25 * s);
@@ -202,10 +203,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 		{
 			core::rect<s32> rect(0, 0, option_w, 30 * s);
 			rect += topleft + v2s32(option_x, option_y);
-			const wchar_t *text =
-					wgettext("Double tap \"jump\" to toggle fly");
-			Environment->addCheckBox(g_settings->getBool("doubletap_jump"),
-					rect, this, GUI_ID_CB_DOUBLETAP_JUMP, text);
+			const wchar_t *text = wgettext("Double tap \"jump\" to toggle fly");
+			Environment->addCheckBox(g_settings->getBool("doubletap_jump"), rect, this,
+					GUI_ID_CB_DOUBLETAP_JUMP, text);
 			delete[] text;
 		}
 		offset += v2s32(0, 25 * s);
@@ -219,8 +219,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 			core::rect<s32> rect(0, 0, option_w, 30 * s);
 			rect += topleft + v2s32(option_x, option_y);
 			const wchar_t *text = wgettext("Automatic jumping");
-			Environment->addCheckBox(g_settings->getBool("autojump"), rect,
-					this, GUI_ID_CB_AUTOJUMP, text);
+			Environment->addCheckBox(g_settings->getBool("autojump"), rect, this,
+					GUI_ID_CB_AUTOJUMP, text);
 			delete[] text;
 		}
 		offset += v2s32(0, 25);
@@ -229,27 +229,25 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect<s32> rect(0, 0, 100 * s, 30 * s);
 		rect += topleft + v2s32(size.X / 2 - 105 * s, size.Y - 40 * s);
-		const wchar_t *text = wgettext("Save");
-		GUIButton::addButton(Environment, rect, m_tsrc, this, GUI_ID_BACK_BUTTON,
-				text);
+		const wchar_t *text =  wgettext("Save");
+		GUIButton::addButton(Environment, rect, m_tsrc, this, GUI_ID_BACK_BUTTON, text);
 		delete[] text;
 	}
 	{
 		core::rect<s32> rect(0, 0, 100 * s, 30 * s);
 		rect += topleft + v2s32(size.X / 2 + 5 * s, size.Y - 40 * s);
 		const wchar_t *text = wgettext("Cancel");
-		GUIButton::addButton(Environment, rect, m_tsrc, this, GUI_ID_ABORT_BUTTON,
-				text);
+		GUIButton::addButton(Environment, rect, m_tsrc, this, GUI_ID_ABORT_BUTTON, text);
 		delete[] text;
 	}
 }
 
 void GUIKeyChangeMenu::drawMenu()
 {
-	gui::IGUISkin *skin = Environment->getSkin();
+	gui::IGUISkin* skin = Environment->getSkin();
 	if (!skin)
 		return;
-	video::IVideoDriver *driver = Environment->getVideoDriver();
+	video::IVideoDriver* driver = Environment->getVideoDriver();
 
 	video::SColor bgcolor(140, 0, 0, 0);
 	driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);
@@ -271,21 +269,18 @@ bool GUIKeyChangeMenu::acceptInput()
 
 	{
 		gui::IGUIElement *e = getElementFromId(GUI_ID_CB_AUX1_DESCENDS);
-		if (e && e->getType() == gui::EGUIET_CHECK_BOX)
-			g_settings->setBool("aux1_descends",
-					((gui::IGUICheckBox *)e)->isChecked());
+		if(e && e->getType() == gui::EGUIET_CHECK_BOX)
+			g_settings->setBool("aux1_descends", ((gui::IGUICheckBox*)e)->isChecked());
 	}
 	{
 		gui::IGUIElement *e = getElementFromId(GUI_ID_CB_DOUBLETAP_JUMP);
-		if (e && e->getType() == gui::EGUIET_CHECK_BOX)
-			g_settings->setBool("doubletap_jump",
-					((gui::IGUICheckBox *)e)->isChecked());
+		if(e && e->getType() == gui::EGUIET_CHECK_BOX)
+			g_settings->setBool("doubletap_jump", ((gui::IGUICheckBox*)e)->isChecked());
 	}
 	{
 		gui::IGUIElement *e = getElementFromId(GUI_ID_CB_AUTOJUMP);
-		if (e && e->getType() == gui::EGUIET_CHECK_BOX)
-			g_settings->setBool("autojump",
-					((gui::IGUICheckBox *)e)->isChecked());
+		if(e && e->getType() == gui::EGUIET_CHECK_BOX)
+			g_settings->setBool("autojump", ((gui::IGUICheckBox*)e)->isChecked());
 	}
 
 	clearKeyCache();
@@ -306,10 +301,10 @@ bool GUIKeyChangeMenu::resetMenu()
 	}
 	return true;
 }
-bool GUIKeyChangeMenu::OnEvent(const SEvent &event)
+bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 {
-	if (event.EventType == EET_KEY_INPUT_EVENT && active_key &&
-			event.KeyInput.PressedDown) {
+	if (event.EventType == EET_KEY_INPUT_EVENT && active_key
+			&& event.KeyInput.PressedDown) {
 
 		bool prefer_character = shift_down;
 		KeyPress kp(event.KeyInput, prefer_character);
@@ -320,10 +315,10 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent &event)
 			kp = active_key->key; // Cancel
 
 		bool shift_went_down = false;
-		if (!shift_down &&
+		if(!shift_down &&
 				(event.KeyInput.Key == irr::KEY_SHIFT ||
-						event.KeyInput.Key == irr::KEY_LSHIFT ||
-						event.KeyInput.Key == irr::KEY_RSHIFT))
+				event.KeyInput.Key == irr::KEY_LSHIFT ||
+				event.KeyInput.Key == irr::KEY_RSHIFT))
 			shift_went_down = true;
 
 		// Display Key already in use message
@@ -341,8 +336,8 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent &event)
 			core::rect<s32> rect(0, 0, 600, 40);
 			rect += v2s32(0, 0) + v2s32(25, 30);
 			const wchar_t *text = wgettext("Key already in use");
-			this->key_used_text = Environment->addStaticText(
-					text, rect, false, true, this, -1);
+			this->key_used_text = Environment->addStaticText(text,
+					rect, false, true, this, -1);
 			delete[] text;
 		} else if (!key_in_use && this->key_used_text) {
 			this->key_used_text->remove();
@@ -357,7 +352,7 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent &event)
 			delete[] text;
 
 			// Allow characters made with shift
-			if (shift_went_down) {
+			if (shift_went_down){
 				shift_down = true;
 				return false;
 			}
@@ -365,46 +360,49 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent &event)
 			active_key = nullptr;
 			return true;
 		}
-	} else if (event.EventType == EET_KEY_INPUT_EVENT && !active_key &&
-			event.KeyInput.PressedDown &&
-			event.KeyInput.Key == irr::KEY_ESCAPE) {
+	} else if (event.EventType == EET_KEY_INPUT_EVENT && !active_key
+			&& event.KeyInput.PressedDown
+			&& event.KeyInput.Key == irr::KEY_ESCAPE) {
 		quitMenu();
 		return true;
 	} else if (event.EventType == EET_GUI_EVENT) {
-		if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST &&
-				isVisible()) {
-			if (!canTakeFocus(event.GUIEvent.Element)) {
-				infostream << "GUIKeyChangeMenu: Not allowing focus "
-					      "change."
-					   << std::endl;
+		if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST
+			&& isVisible())
+		{
+			if (!canTakeFocus(event.GUIEvent.Element))
+			{
+				infostream << "GUIKeyChangeMenu: Not allowing focus change."
+				<< std::endl;
 				// Returning true disables focus change
 				return true;
 			}
 		}
-		if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
-			switch (event.GUIEvent.Caller->getID()) {
-			case GUI_ID_BACK_BUTTON: // back
-				acceptInput();
-				quitMenu();
-				return true;
-			case GUI_ID_ABORT_BUTTON: // abort
-				quitMenu();
-				return true;
-			default:
-				resetMenu();
-				for (key_setting *ks : key_settings) {
-					if (ks->id == event.GUIEvent.Caller->getID()) {
-						active_key = ks;
-						break;
+		if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED)
+		{
+			switch (event.GUIEvent.Caller->getID())
+			{
+				case GUI_ID_BACK_BUTTON: //back
+					acceptInput();
+					quitMenu();
+					return true;
+				case GUI_ID_ABORT_BUTTON: //abort
+					quitMenu();
+					return true;
+				default:
+					resetMenu();
+					for (key_setting *ks : key_settings) {
+						if (ks->id == event.GUIEvent.Caller->getID()) {
+							active_key = ks;
+							break;
+						}
 					}
-				}
-				FATAL_ERROR_IF(!active_key, "Key setting not found");
+					FATAL_ERROR_IF(!active_key, "Key setting not found");
 
-				shift_down = false;
-				const wchar_t *text = wgettext("press key");
-				active_key->button->setText(text);
-				delete[] text;
-				break;
+					shift_down = false;
+					const wchar_t *text = wgettext("press key");
+					active_key->button->setText(text);
+					delete[] text;
+					break;
 			}
 			Environment->setFocus(this);
 		}
@@ -412,8 +410,7 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent &event)
 	return Parent ? Parent->OnEvent(event) : false;
 }
 
-void GUIKeyChangeMenu::add_key(
-		int id, const wchar_t *button_name, const std::string &setting_name)
+void GUIKeyChangeMenu::add_key(int id, const wchar_t *button_name, const std::string &setting_name)
 {
 	key_setting *k = new key_setting;
 	k->id = id;
@@ -426,76 +423,48 @@ void GUIKeyChangeMenu::add_key(
 
 void GUIKeyChangeMenu::init_keys()
 {
-	this->add_key(GUI_ID_KEY_FORWARD_BUTTON, wgettext("Forward"), "keymap_forward");
-	this->add_key(GUI_ID_KEY_BACKWARD_BUTTON, wgettext("Backward"),
-			"keymap_backward");
-	this->add_key(GUI_ID_KEY_LEFT_BUTTON, wgettext("Left"), "keymap_left");
-	this->add_key(GUI_ID_KEY_RIGHT_BUTTON, wgettext("Right"), "keymap_right");
-	this->add_key(GUI_ID_KEY_USE_BUTTON, wgettext("Special"), "keymap_special1");
-	this->add_key(GUI_ID_KEY_JUMP_BUTTON, wgettext("Jump"), "keymap_jump");
-	this->add_key(GUI_ID_KEY_SNEAK_BUTTON, wgettext("Sneak"), "keymap_sneak");
-	this->add_key(GUI_ID_KEY_DROP_BUTTON, wgettext("Drop"), "keymap_drop");
-	this->add_key(GUI_ID_KEY_INVENTORY_BUTTON, wgettext("Inventory"),
-			"keymap_inventory");
-	this->add_key(GUI_ID_KEY_ENDERCHEST_BUTTON, wgettext("Enderchest"),
-			"keymap_enderchest");
-	this->add_key(GUI_ID_KEY_HOTBAR_PREV_BUTTON, wgettext("Prev. item"),
-			"keymap_hotbar_previous");
-	this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON, wgettext("Next item"),
-			"keymap_hotbar_next");
-	this->add_key(GUI_ID_KEY_ZOOM_BUTTON, wgettext("Zoom"), "keymap_zoom");
-	this->add_key(GUI_ID_KEY_CAMERA_BUTTON, wgettext("Change camera"),
-			"keymap_camera_mode");
-	this->add_key(GUI_ID_KEY_MINIMAP_BUTTON, wgettext("Toggle minimap"),
-			"keymap_minimap");
-	this->add_key(GUI_ID_KEY_FLY_BUTTON, wgettext("Toggle fly"), "keymap_freemove");
-	this->add_key(GUI_ID_KEY_PITCH_MOVE, wgettext("Toggle pitchmove"),
-			"keymap_pitchmove");
-	this->add_key(GUI_ID_KEY_FAST_BUTTON, wgettext("Toggle fast"), "keymap_fastmove");
-	this->add_key(GUI_ID_KEY_NOCLIP_BUTTON, wgettext("Toggle noclip"),
-			"keymap_noclip");
-	this->add_key(GUI_ID_KEY_MUTE_BUTTON, wgettext("Mute"), "keymap_mute");
-	this->add_key(GUI_ID_KEY_DEC_VOLUME_BUTTON, wgettext("Dec. volume"),
-			"keymap_decrease_volume");
-	this->add_key(GUI_ID_KEY_INC_VOLUME_BUTTON, wgettext("Inc. volume"),
-			"keymap_increase_volume");
-	this->add_key(GUI_ID_KEY_AUTOFWD_BUTTON, wgettext("Autoforward"),
-			"keymap_autoforward");
-	this->add_key(GUI_ID_KEY_CHAT_BUTTON, wgettext("Chat"), "keymap_chat");
-	this->add_key(GUI_ID_KEY_SCREENSHOT_BUTTON, wgettext("Screenshot"),
-			"keymap_screenshot");
-	this->add_key(GUI_ID_KEY_RANGE_BUTTON, wgettext("Range select"),
-			"keymap_rangeselect");
-	this->add_key(GUI_ID_KEY_DEC_RANGE_BUTTON, wgettext("Dec. range"),
-			"keymap_decrease_viewing_range_min");
-	this->add_key(GUI_ID_KEY_INC_RANGE_BUTTON, wgettext("Inc. range"),
-			"keymap_increase_viewing_range_min");
-	this->add_key(GUI_ID_KEY_CONSOLE_BUTTON, wgettext("Console"), "keymap_console");
-	this->add_key(GUI_ID_KEY_CMD_BUTTON, wgettext("Command"), "keymap_cmd");
-	this->add_key(GUI_ID_KEY_CMD_LOCAL_BUTTON, wgettext("Local command"),
-			"keymap_cmd_local");
-	this->add_key(GUI_ID_KEY_HUD_BUTTON, wgettext("Toggle HUD"), "keymap_toggle_hud");
-	this->add_key(GUI_ID_KEY_CHATLOG_BUTTON, wgettext("Toggle chat log"),
-			"keymap_toggle_chat");
-	this->add_key(GUI_ID_KEY_FOG_BUTTON, wgettext("Toggle fog"), "keymap_toggle_fog");
-	this->add_key(GUI_ID_KEY_CHEAT_MENU_BUTTON, wgettext("Toggle C. Menu"),
-			"keymap_toggle_cheat_menu");
-	this->add_key(GUI_ID_KEY_KILLAURA_BUTTON, wgettext("Killaura"),
-			"keymap_toggle_killaura");
-	this->add_key(GUI_ID_KEY_FREECAM_BUTTON, wgettext("Freecam"),
-			"keymap_toggle_freecam");
-	this->add_key(GUI_ID_KEY_SCAFFOLD_BUTTON, wgettext("Scaffold"),
-			"keymap_toggle_scaffold");
-	this->add_key(GUI_ID_KEY_NEXT_ITEM_BUTTON, wgettext("NextItem"),
-			"keymap_toggle_next_item");
-	this->add_key(GUI_ID_KEY_SELECT_UP_BUTTON, wgettext("C. Menu Up"),
-			"keymap_select_up");
-	this->add_key(GUI_ID_KEY_SELECT_DOWN_BUTTON, wgettext("C. Menu Down"),
-			"keymap_select_down");
-	this->add_key(GUI_ID_KEY_SELECT_LEFT_BUTTON, wgettext("C. Menu Left"),
-			"keymap_select_left");
-	this->add_key(GUI_ID_KEY_SELECT_RIGHT_BUTTON, wgettext("C. Menu Right"),
-			"keymap_select_right");
-	this->add_key(GUI_ID_KEY_SELECT_CONFIRM_BUTTON, wgettext("C. Menu Enter"),
-			"keymap_select_confirm");
+	this->add_key(GUI_ID_KEY_FORWARD_BUTTON,   wgettext("Forward"),          "keymap_forward");
+	this->add_key(GUI_ID_KEY_BACKWARD_BUTTON,  wgettext("Backward"),         "keymap_backward");
+	this->add_key(GUI_ID_KEY_LEFT_BUTTON,      wgettext("Left"),             "keymap_left");
+	this->add_key(GUI_ID_KEY_RIGHT_BUTTON,     wgettext("Right"),            "keymap_right");
+	this->add_key(GUI_ID_KEY_USE_BUTTON,       wgettext("Special"),          "keymap_special1");
+	this->add_key(GUI_ID_KEY_JUMP_BUTTON,      wgettext("Jump"),             "keymap_jump");
+	this->add_key(GUI_ID_KEY_SNEAK_BUTTON,     wgettext("Sneak"),            "keymap_sneak");
+	this->add_key(GUI_ID_KEY_DROP_BUTTON,      wgettext("Drop"),             "keymap_drop");
+	this->add_key(GUI_ID_KEY_INVENTORY_BUTTON, wgettext("Inventory"),        "keymap_inventory");
+	this->add_key(GUI_ID_KEY_ENDERCHEST_BUTTON,wgettext("Enderchest"),		 "keymap_enderchest");
+	this->add_key(GUI_ID_KEY_HOTBAR_PREV_BUTTON,wgettext("Prev. item"),      "keymap_hotbar_previous");
+	this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"),       "keymap_hotbar_next");
+	this->add_key(GUI_ID_KEY_ZOOM_BUTTON,      wgettext("Zoom"),             "keymap_zoom");
+	this->add_key(GUI_ID_KEY_CAMERA_BUTTON,    wgettext("Change camera"),    "keymap_camera_mode");
+	this->add_key(GUI_ID_KEY_MINIMAP_BUTTON,   wgettext("Toggle minimap"),   "keymap_minimap");
+	this->add_key(GUI_ID_KEY_FLY_BUTTON,       wgettext("Toggle fly"),       "keymap_freemove");
+	this->add_key(GUI_ID_KEY_PITCH_MOVE,       wgettext("Toggle pitchmove"), "keymap_pitchmove");
+	this->add_key(GUI_ID_KEY_FAST_BUTTON,      wgettext("Toggle fast"),      "keymap_fastmove");
+	this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,    wgettext("Toggle noclip"),    "keymap_noclip");
+	this->add_key(GUI_ID_KEY_MUTE_BUTTON,      wgettext("Mute"),             "keymap_mute");
+	this->add_key(GUI_ID_KEY_DEC_VOLUME_BUTTON,wgettext("Dec. volume"),      "keymap_decrease_volume");
+	this->add_key(GUI_ID_KEY_INC_VOLUME_BUTTON,wgettext("Inc. volume"),      "keymap_increase_volume");
+	this->add_key(GUI_ID_KEY_AUTOFWD_BUTTON,   wgettext("Autoforward"),      "keymap_autoforward");
+	this->add_key(GUI_ID_KEY_CHAT_BUTTON,      wgettext("Chat"),             "keymap_chat");
+	this->add_key(GUI_ID_KEY_SCREENSHOT_BUTTON,wgettext("Screenshot"),       "keymap_screenshot");
+	this->add_key(GUI_ID_KEY_RANGE_BUTTON,     wgettext("Range select"),     "keymap_rangeselect");
+	this->add_key(GUI_ID_KEY_DEC_RANGE_BUTTON, wgettext("Dec. range"),       "keymap_decrease_viewing_range_min");
+	this->add_key(GUI_ID_KEY_INC_RANGE_BUTTON, wgettext("Inc. range"),       "keymap_increase_viewing_range_min");
+	this->add_key(GUI_ID_KEY_CONSOLE_BUTTON,   wgettext("Console"),          "keymap_console");
+	this->add_key(GUI_ID_KEY_CMD_BUTTON,       wgettext("Command"),          "keymap_cmd");
+	this->add_key(GUI_ID_KEY_CMD_LOCAL_BUTTON, wgettext("Local command"),    "keymap_cmd_local");
+	this->add_key(GUI_ID_KEY_HUD_BUTTON,       wgettext("Toggle HUD"),       "keymap_toggle_hud");
+	this->add_key(GUI_ID_KEY_CHATLOG_BUTTON,   wgettext("Toggle chat log"),  "keymap_toggle_chat");
+	this->add_key(GUI_ID_KEY_FOG_BUTTON,       wgettext("Toggle fog"),       "keymap_toggle_fog");
+	this->add_key(GUI_ID_KEY_CHEAT_MENU_BUTTON,wgettext("Toggle C. Menu"),"keymap_toggle_cheat_menu");
+	this->add_key(GUI_ID_KEY_KILLAURA_BUTTON,  wgettext("Killaura"),  "keymap_toggle_killaura");
+	this->add_key(GUI_ID_KEY_FREECAM_BUTTON,   wgettext("Freecam"),    "keymap_toggle_freecam");
+	this->add_key(GUI_ID_KEY_SCAFFOLD_BUTTON,  wgettext("Scaffold"),    "keymap_toggle_scaffold");
+	this->add_key(GUI_ID_KEY_NEXT_ITEM_BUTTON, wgettext("NextItem"),    "keymap_toggle_next_item");
+	this->add_key(GUI_ID_KEY_SELECT_UP_BUTTON, wgettext("C. Menu Up"),    "keymap_select_up");
+	this->add_key(GUI_ID_KEY_SELECT_DOWN_BUTTON,wgettext("C. Menu Down"), "keymap_select_down");
+	this->add_key(GUI_ID_KEY_SELECT_LEFT_BUTTON,wgettext("C. Menu Left"), "keymap_select_left");
+	this->add_key(GUI_ID_KEY_SELECT_RIGHT_BUTTON,wgettext("C. Menu Right"),"keymap_select_right");
+	this->add_key(GUI_ID_KEY_SELECT_CONFIRM_BUTTON,wgettext("C. Menu Enter"),"keymap_select_confirm");
 }