diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-11-29 19:15:41 +0100 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-11-29 19:15:41 +0100 |
| commit | 0a285dd338fb415744e3fb8d6a1cc3763d796c4a (patch) | |
| tree | b74c9a43a0434248c8f81f539638d5791493b776 /src/client | |
| parent | 4695222bc39578643e2ae64fb8725f45a340a008 (diff) | |
| download | dragonfireclient-0a285dd338fb415744e3fb8d6a1cc3763d796c4a.tar.xz | |
Remove NextItem
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/game.cpp | 18 | ||||
| -rw-r--r-- | src/client/inputhandler.cpp | 1 | ||||
| -rw-r--r-- | src/client/keys.h | 1 |
3 files changed, 1 insertions, 19 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, |