minetest-stuffs
/
dragonfire-engine-teran
1
0
Fork 0
Code Pull Requests Activity

Revert changes to toggleNoClip and toggleFreeMove

master
Lars Hofhansl 2016-10-16 23:55:49 -07:00 committed by Ner'zhul
parent 3253b6bd22
commit a291cd6132
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game.cpp
View File

@ -1845,6 +1845,10 @@ Game::~Game()
&settingChangedCallback, this); &settingChangedCallback, this);
g_settings->deregisterChangedCallback("repeat_rightclick_time", g_settings->deregisterChangedCallback("repeat_rightclick_time",
&settingChangedCallback, this); &settingChangedCallback, this);
g_settings->deregisterChangedCallback("noclip",
&settingChangedCallback, this);
g_settings->deregisterChangedCallback("free_move",
&settingChangedCallback, this);
} }
bool Game::startup(bool *kill, 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" }; static const wchar_t *msg[] = { L"free_move disabled", L"free_move enabled" };
bool free_move = !g_settings->getBool("free_move"); bool free_move = !g_settings->getBool("free_move");
g_settings->set("free_move", bool_to_cstr(free_move));
*statustext_time = 0; *statustext_time = 0;
statustext = msg[free_move]; statustext = msg[free_move];
if (free_move && !client->checkPrivilege("fly")) { if (free_move && !client->checkPrivilege("fly"))
statustext += L" (note: no 'fly' privilege)"; 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" }; static const wchar_t *msg[] = { L"noclip disabled", L"noclip enabled" };
bool noclip = !g_settings->getBool("noclip"); bool noclip = !g_settings->getBool("noclip");
g_settings->set("noclip", bool_to_cstr(noclip));
*statustext_time = 0; *statustext_time = 0;
statustext = msg[noclip]; statustext = msg[noclip];
if (noclip && !client->checkPrivilege("noclip")) { if (noclip && !client->checkPrivilege("noclip"))
statustext += L" (note: no 'noclip' privilege)"; statustext += L" (note: no 'noclip' privilege)";
} else {
g_settings->set("noclip", bool_to_cstr(noclip));
}
} }
void Game::toggleCinematic(float *statustext_time) void Game::toggleCinematic(float *statustext_time)