diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/game.cpp | 18 | ||||
| -rw-r--r-- | src/client/inputhandler.cpp | 1 | ||||
| -rw-r--r-- | src/client/keys.h | 1 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 2 | ||||
| -rw-r--r-- | src/gui/guiKeyChangeMenu.cpp | 2 |
5 files changed, 1 insertions, 23 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp index f79fdba8c..69feeef97 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1125,8 +1125,6 @@ void Game::processKeyInput() toggleFreecam(); } else if (wasKeyDown(KeyType::SCAFFOLD)) { toggleScaffold(); - } else if (wasKeyDown(KeyType::NEXT_ITEM)) { - toggleNextItem(); #if USE_SOUND } else if (wasKeyDown(KeyType::MUTE)) { if (g_settings->getBool("enable_sound")) { @@ -1448,18 +1446,6 @@ void Game::toggleScaffold() } } -void Game::toggleNextItem() -{ - bool next_item = ! g_settings->getBool("next_item"); - g_settings->set("next_item", bool_to_cstr(next_item)); - - if (next_item) { - m_game_ui->showTranslatedStatusText("NextItem enabled"); - } else { - m_game_ui->showTranslatedStatusText("NextItem disabled"); - } -} - void Game::toggleCinematic() { bool cinematic = !g_settings->getBool("cinematic"); @@ -3472,7 +3458,6 @@ void Game::showPauseMenu() "- %s: Killaura\n" "- %s: Freecam\n" "- %s: Scaffold\n" - "- %s: NextItem\n" ); char control_text_buf[600]; @@ -3492,8 +3477,7 @@ void Game::showPauseMenu() GET_KEY_NAME(keymap_chat), GET_KEY_NAME(keymap_toggle_killaura), GET_KEY_NAME(keymap_toggle_freecam), - GET_KEY_NAME(keymap_toggle_scaffold), - GET_KEY_NAME(keymap_toggle_next_item) + GET_KEY_NAME(keymap_toggle_scaffold) ); std::string control_text = std::string(control_text_buf); diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp index 37ab838c0..544c0e344 100644 --- a/src/client/inputhandler.cpp +++ b/src/client/inputhandler.cpp @@ -78,7 +78,6 @@ void KeyCache::populate() key[KeyType::KILLAURA] = getKeySetting("keymap_toggle_killaura"); key[KeyType::FREECAM] = getKeySetting("keymap_toggle_freecam"); key[KeyType::SCAFFOLD] = getKeySetting("keymap_toggle_scaffold"); - key[KeyType::NEXT_ITEM] = getKeySetting("keymap_toggle_next_item"); key[KeyType::SELECT_UP] = getKeySetting("keymap_select_up"); key[KeyType::SELECT_DOWN] = getKeySetting("keymap_select_down"); key[KeyType::SELECT_LEFT] = getKeySetting("keymap_select_left"); diff --git a/src/client/keys.h b/src/client/keys.h index 828ea3ec4..d4f3dd4c1 100644 --- a/src/client/keys.h +++ b/src/client/keys.h @@ -75,7 +75,6 @@ public: KILLAURA, FREECAM, SCAFFOLD, - NEXT_ITEM, SELECT_UP, SELECT_DOWN, SELECT_LEFT, diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 7c53cacc8..141070003 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -110,7 +110,6 @@ void set_default_settings(Settings *settings) settings->setDefault("eject_items", ""); settings->setDefault("autotool", "false"); settings->setDefault("autorespawn", "false"); - settings->setDefault("next_item", "false"); settings->setDefault("scaffold", "false"); settings->setDefault("scaffold_plus", "false"); settings->setDefault("block_water", "false"); @@ -198,7 +197,6 @@ void set_default_settings(Settings *settings) settings->setDefault("keymap_toggle_killaura", "KEY_KEY_X"); settings->setDefault("keymap_toggle_freecam", "KEY_KEY_G"); settings->setDefault("keymap_toggle_scaffold", "KEY_KEY_Y"); - settings->setDefault("keymap_toggle_next_item", "KEY_KEY_U"); settings->setDefault("keymap_select_up", "KEY_UP"); settings->setDefault("keymap_select_down", "KEY_DOWN"); settings->setDefault("keymap_select_left", "KEY_LEFT"); diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp index 94fe0074a..a7270da06 100644 --- a/src/gui/guiKeyChangeMenu.cpp +++ b/src/gui/guiKeyChangeMenu.cpp @@ -80,7 +80,6 @@ enum GUI_ID_KEY_KILLAURA_BUTTON, GUI_ID_KEY_FREECAM_BUTTON, GUI_ID_KEY_SCAFFOLD_BUTTON, - GUI_ID_KEY_NEXT_ITEM_BUTTON, GUI_ID_KEY_SELECT_UP_BUTTON, GUI_ID_KEY_SELECT_DOWN_BUTTON, GUI_ID_KEY_SELECT_LEFT_BUTTON, @@ -461,7 +460,6 @@ void GUIKeyChangeMenu::init_keys() 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"); |