5 files changed, 9 insertions, 49 deletions

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 0e2b8472f..74e7b9b0d 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1456,6 +1456,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 	case InventoryLocation::UNDEFINED:
 	{}
 	break;
+	case InventoryLocation::PLAYER:
 	case InventoryLocation::CURRENT_PLAYER:
 	{
 		LocalPlayer *player = m_env.getLocalPlayer();
@@ -1463,15 +1464,6 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 		return &player->inventory;
 	}
 	break;
-	case InventoryLocation::PLAYER:
-	{
-		// Check if we are working with local player inventory
-		LocalPlayer *player = m_env.getLocalPlayer();
-		if (!player || strcmp(player->getName(), loc.name.c_str()) != 0)
-			return NULL;
-		return &player->inventory;
-	}
-	break;
 	case InventoryLocation::NODEMETA:
 	{
 		NodeMetadata *meta = m_env.getMap().getNodeMetadata(loc.p);
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 6a3902e1a..b08dac878 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -112,6 +112,8 @@ Game::Game() :
 		&freecamChangedCallback, this);
 	g_settings->registerChangedCallback("xray",
 		&updateAllMapBlocksCallback, this);
+	g_settings->registerChangedCallback("xray_node",
+		&updateAllMapBlocksCallback, this);
 	g_settings->registerChangedCallback("fullbright",
 		&updateAllMapBlocksCallback, this);
 		
@@ -174,6 +176,12 @@ Game::~Game()
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("freecam",
 		&freecamChangedCallback, this);
+	g_settings->deregisterChangedCallback("xray",
+		&updateAllMapBlocksCallback, this);
+	g_settings->deregisterChangedCallback("xray_node",
+		&updateAllMapBlocksCallback, this);
+	g_settings->deregisterChangedCallback("fullbright",
+		&updateAllMapBlocksCallback, this);
 }
 
 bool Game::startup(bool *kill,
@@ -1107,10 +1115,6 @@ void Game::processKeyInput()
 		toggleFast();
 	} else if (wasKeyDown(KeyType::NOCLIP)) {
 		toggleNoClip();
-	} else if (wasKeyDown(KeyType::XRAY)) {
-		toggleXray();
-	} else if (wasKeyDown(KeyType::FULLBRIGHT)) {
-		toggleFullbright();
 	} else if (wasKeyDown(KeyType::KILLAURA)) {
 		toggleKillaura();
 	} else if (wasKeyDown(KeyType::FREECAM)) {
@@ -1414,32 +1418,6 @@ void Game::toggleNoClip()
 	}
 }
 
-void Game::toggleXray()
-{
-	bool xray = ! g_settings->getBool("xray");
-	g_settings->set("xray", bool_to_cstr(xray));
-
-	if (xray) {
-		m_game_ui->showTranslatedStatusText("Xray enabled");
-	} else {
-		m_game_ui->showTranslatedStatusText("Xray disabled");
-	}
-	client->m_mesh_update_thread.doUpdate();
-}
-
-void Game::toggleFullbright()
-{
-	bool fullbright = ! g_settings->getBool("fullbright");
-	g_settings->set("fullbright", bool_to_cstr(fullbright));
-
-	if (fullbright) {
-		m_game_ui->showTranslatedStatusText("Fullbright enabled");
-	} else {
-		m_game_ui->showTranslatedStatusText("Fullbright disabled");
-	}
-	client->m_mesh_update_thread.doUpdate();
-}
-
 void Game::toggleKillaura()
 {
 	bool killaura = ! g_settings->getBool("killaura");
@@ -3478,8 +3456,6 @@ void Game::showPauseMenu()
 		"- Mouse right: place/use\n"
 		"- Mouse wheel: select item\n"
 		"- %s: chat\n"
-		"- %s: X-Ray\n"
-		"- %s: Fullbright\n"
 		"- %s: Killaura\n"
 		"- %s: Freecam\n"
 	);
@@ -3497,8 +3473,6 @@ void Game::showPauseMenu()
 			GET_KEY_NAME(keymap_inventory),
 			GET_KEY_NAME(keymap_special_inventory),
 			GET_KEY_NAME(keymap_chat),
-			GET_KEY_NAME(keymap_toggle_xray),
-			GET_KEY_NAME(keymap_toggle_fullbright),
 			GET_KEY_NAME(keymap_toggle_killaura),
 			GET_KEY_NAME(keymap_toggle_freecam)
 			);
diff --git a/src/client/game.h b/src/client/game.h
index a452c30c6..aac8f8f38 100644
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -732,8 +732,6 @@ public:
 	void togglePitchMove();
 	void toggleFast();
 	void toggleNoClip();
-	void toggleXray();
-	void toggleFullbright();
 	void toggleKillaura();
 	void toggleFreecam();
 	void toggleCinematic();
diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index b78304d96..edf2056d0 100644
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -73,8 +73,6 @@ void KeyCache::populate()
 			getKeySetting("keymap_decrease_viewing_range_min");
 	key[KeyType::RANGESELECT] = getKeySetting("keymap_rangeselect");
 	key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
-	key[KeyType::XRAY] = getKeySetting("keymap_toggle_xray");
-	key[KeyType::FULLBRIGHT] = getKeySetting("keymap_toggle_fullbright");
 	key[KeyType::KILLAURA] = getKeySetting("keymap_toggle_killaura");
 	key[KeyType::FREECAM] = getKeySetting("keymap_toggle_freecam");
 	key[KeyType::SELECT_UP] = getKeySetting("keymap_select_up");
diff --git a/src/client/keys.h b/src/client/keys.h
index 98c51f7a5..b29e232fd 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -70,8 +70,6 @@ public:
 		DECREASE_VIEWING_RANGE,
 		RANGESELECT,
 		ZOOM,
-		XRAY,
-		FULLBRIGHT,
 		KILLAURA,
 		FREECAM,
 		SELECT_UP,