BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Get rid of basic_debug last minute

Browse Source 
This isn't a revert but rather just disables the codepaths. also see #12011
This commit is contained in:
sfan5 2022-01-30 21:32:49 +01:00 committed by GitHub
parent b66477c29f
commit 5da204f5bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/game/privileges.lua
View File

@ -97,10 +97,6 @@ core.register_privilege("rollback", {
description = S("Can use the rollback functionality"),
give_to_singleplayer = false,
})
core.register_privilege("basic_debug", {
description = S("Can view more debug info that might give a gameplay advantage"),
give_to_singleplayer = false,
})
core.register_privilege("debug", {
description = S("Can enable wireframe"),
give_to_singleplayer = false,

18
src/client/game.cpp
View File

@ -1740,7 +1740,7 @@ void Game::processQueues()
void Game::updateDebugState()
{
bool has_basic_debug = client->checkPrivilege("basic_debug");
const bool has_basic_debug = true;
bool has_debug = client->checkPrivilege("debug");
if (m_game_ui->m_flags.show_basic_debug) {
@ -2211,7 +2211,7 @@ void Game::toggleCinematic()
void Game::toggleBlockBounds()
{
if (client->checkPrivilege("basic_debug")) {
if (true /* basic_debug */) {
enum Hud::BlockBoundsMode newmode = hud->toggleBlockBounds();
switch (newmode) {
case Hud::BLOCK_BOUNDS_OFF:
@ -2307,26 +2307,24 @@ void Game::toggleDebug()
// The debug text can be in 2 modes: minimal and basic.
// * Minimal: Only technical client info that not gameplay-relevant
// * Basic: Info that might give gameplay advantage, e.g. pos, angle
// Basic mode is used when player has "basic_debug" priv,
// otherwise the Minimal mode is used.
// Basic mode is always used.
const bool has_basic_debug = true;
if (!m_game_ui->m_flags.show_minimal_debug) {
m_game_ui->m_flags.show_minimal_debug = true;
if (client->checkPrivilege("basic_debug")) {
if (has_basic_debug)
m_game_ui->m_flags.show_basic_debug = true;
}
m_game_ui->m_flags.show_profiler_graph = false;
draw_control->show_wireframe = false;
m_game_ui->showTranslatedStatusText("Debug info shown");
} else if (!m_game_ui->m_flags.show_profiler_graph && !draw_control->show_wireframe) {
if (client->checkPrivilege("basic_debug")) {
if (has_basic_debug)
m_game_ui->m_flags.show_basic_debug = true;
}
m_game_ui->m_flags.show_profiler_graph = true;
m_game_ui->showTranslatedStatusText("Profiler graph shown");
} else if (!draw_control->show_wireframe && client->checkPrivilege("debug")) {
if (client->checkPrivilege("basic_debug")) {
if (has_basic_debug)
m_game_ui->m_flags.show_basic_debug = true;
}
m_game_ui->m_flags.show_profiler_graph = false;
draw_control->show_wireframe = true;
m_game_ui->showTranslatedStatusText("Wireframe shown");

1
src/client/gameui.cpp
View File

@ -210,7 +210,6 @@ void GameUI::initFlags()
{
m_flags = GameUI::Flags();
m_flags.show_minimal_debug = g_settings->getBool("show_debug");
m_flags.show_basic_debug = false;
}
void GameUI::showMinimap(bool show)

5
src/network/clientpackethandler.cpp
View File

@ -900,11 +900,6 @@ void Client::handleCommand_Privileges(NetworkPacket* pkt)
m_privileges.insert(priv);
infostream << priv << " ";
}
// Enable basic_debug on server versions before it was added
if (m_proto_ver < 40)
m_privileges.insert("basic_debug");
infostream << std::endl;
}

1
src/network/networkprotocol.h
View File

@ -206,7 +206,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
Adds new sun, moon and stars packets
Minimap modes
PROTOCOL VERSION 40:
Added 'basic_debug' privilege
TOCLIENT_MEDIA_PUSH changed, TOSERVER_HAVE_MEDIA added
*/