Skip to content
Permalink
Browse files
Fix revoke debug privs not reliably turn off stuff (#11409)
  • Loading branch information
Wuzzy2 committed Jul 12, 2021
1 parent 5c89a0e commit b7b5aad02758ae897fc0239f50f93e04d085ceed
Showing with 12 additions and 6 deletions.
  1. +12 −6 src/client/game.cpp
@@ -677,7 +677,7 @@ class Game {
bool handleCallbacks();
void processQueues();
void updateProfilers(const RunStats &stats, const FpsControl &draw_times, f32 dtime);
void updateBasicDebugState();
void updateDebugState();
void updateStats(RunStats *stats, const FpsControl &draw_times, f32 dtime);
void updateProfilerGraphs(ProfilerGraph *graph);

@@ -1123,7 +1123,7 @@ void Game::run()
updatePlayerControl(cam_view);
step(&dtime);
processClientEvents(&cam_view_target);
updateBasicDebugState();
updateDebugState();
updateCamera(draw_times.busy_time, dtime);
updateSound(dtime);
processPlayerInteraction(dtime, m_game_ui->m_flags.show_hud,
@@ -1728,18 +1728,24 @@ void Game::processQueues()
shader_src->processQueue();
}

void Game::updateBasicDebugState()
void Game::updateDebugState()
{
bool has_basic_debug = client->checkPrivilege("basic_debug");
bool has_debug = client->checkPrivilege("debug");

if (m_game_ui->m_flags.show_basic_debug) {
if (!client->checkPrivilege("basic_debug")) {
if (!has_basic_debug) {
m_game_ui->m_flags.show_basic_debug = false;
hud->disableBlockBounds();
}
} else if (m_game_ui->m_flags.show_minimal_debug) {
if (client->checkPrivilege("basic_debug")) {
if (has_basic_debug) {
m_game_ui->m_flags.show_basic_debug = true;
}
}
if (!has_basic_debug)
hud->disableBlockBounds();
if (!has_debug)
draw_control->show_wireframe = false;
}

void Game::updateProfilers(const RunStats &stats, const FpsControl &draw_times,

0 comments on commit b7b5aad

Please sign in to comment.