From: Lars Hofhansl <larsh@apache.org>
Date: Mon, 17 Oct 2016 06:55:49 +0000 (-0700)
Subject: Revert changes to toggleNoClip and toggleFreeMove
X-Git-Tag: 0.4.15~168
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a291cd61320c2d041d64ed2d56d073d70066efd1;p=oweals%2Fminetest.git

Revert changes to toggleNoClip and toggleFreeMove
---

diff --git a/src/game.cpp b/src/game.cpp
index 83ef9c0b0..3ba600ed5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1845,6 +1845,10 @@ Game::~Game()
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("repeat_rightclick_time",
 		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("noclip",
+		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("free_move",
+		&settingChangedCallback, this);
 }
 
 bool Game::startup(bool *kill,
@@ -2965,14 +2969,12 @@ void Game::toggleFreeMove(float *statustext_time)
 	static const wchar_t *msg[] = { L"free_move disabled", L"free_move enabled" };
 
 	bool free_move = !g_settings->getBool("free_move");
+	g_settings->set("free_move", bool_to_cstr(free_move));
 
 	*statustext_time = 0;
 	statustext = msg[free_move];
-	if (free_move && !client->checkPrivilege("fly")) {
+	if (free_move && !client->checkPrivilege("fly"))
 		statustext += L" (note: no 'fly' privilege)";
-	} else {
-		g_settings->set("free_move", bool_to_cstr(free_move));
-	}
 }
 
 
@@ -3007,15 +3009,13 @@ void Game::toggleNoClip(float *statustext_time)
 {
 	static const wchar_t *msg[] = { L"noclip disabled", L"noclip enabled" };
 	bool noclip = !g_settings->getBool("noclip");
+	g_settings->set("noclip", bool_to_cstr(noclip));
 
 	*statustext_time = 0;
 	statustext = msg[noclip];
 
-	if (noclip && !client->checkPrivilege("noclip")) {
+	if (noclip && !client->checkPrivilege("noclip"))
 		statustext += L" (note: no 'noclip' privilege)";
-	} else {
-		g_settings->set("noclip", bool_to_cstr(noclip));
-	}
 }
 
 void Game::toggleCinematic(float *statustext_time)