Skip to content
Permalink
Browse files
Show status message when changing block bounds (#11556)
  • Loading branch information
Wuzzy2 committed Aug 21, 2021
1 parent e7b05be commit 6fd8aede48e357524ea0723fd0e8836697ece11e
Showing with 30 additions and 12 deletions.
  1. +18 −1 src/client/game.cpp
  2. +3 −2 src/client/hud.cpp
  3. +9 −9 src/client/hud.h
@@ -2193,7 +2193,24 @@ void Game::toggleCinematic()
void Game::toggleBlockBounds()
{
if (client->checkPrivilege("basic_debug")) {
hud->toggleBlockBounds();
enum Hud::BlockBoundsMode newmode = hud->toggleBlockBounds();
switch (newmode) {
case Hud::BLOCK_BOUNDS_OFF:
m_game_ui->showTranslatedStatusText("Block bounds hidden");
break;
case Hud::BLOCK_BOUNDS_CURRENT:
m_game_ui->showTranslatedStatusText("Block bounds shown for current block");
break;
case Hud::BLOCK_BOUNDS_NEAR:
m_game_ui->showTranslatedStatusText("Block bounds shown for nearby blocks");
break;
case Hud::BLOCK_BOUNDS_MAX:
m_game_ui->showTranslatedStatusText("Block bounds shown for all blocks");
break;
default:
break;
}

} else {
m_game_ui->showTranslatedStatusText("Can't show block bounds (need 'basic_debug' privilege)");
}
@@ -857,13 +857,14 @@ void Hud::drawSelectionMesh()
}
}

void Hud::toggleBlockBounds()
enum Hud::BlockBoundsMode Hud::toggleBlockBounds()
{
m_block_bounds_mode = static_cast<BlockBoundsMode>(m_block_bounds_mode + 1);

if (m_block_bounds_mode >= BLOCK_BOUNDS_MAX) {
m_block_bounds_mode = BLOCK_BOUNDS_OFF;
}
return m_block_bounds_mode;
}

void Hud::disableBlockBounds()
@@ -890,7 +891,7 @@ void Hud::drawBlockBounds()

v3f offset = intToFloat(client->getCamera()->getOffset(), BS);

s8 radius = m_block_bounds_mode == BLOCK_BOUNDS_ALL ? 2 : 0;
s8 radius = m_block_bounds_mode == BLOCK_BOUNDS_NEAR ? 2 : 0;

v3f halfNode = v3f(BS, BS, BS) / 2.0f;

@@ -35,6 +35,14 @@ struct ItemStack;
class Hud
{
public:
enum BlockBoundsMode
{
BLOCK_BOUNDS_OFF,
BLOCK_BOUNDS_CURRENT,
BLOCK_BOUNDS_NEAR,
BLOCK_BOUNDS_MAX
} m_block_bounds_mode = BLOCK_BOUNDS_OFF;

video::SColor crosshair_argb;
video::SColor selectionbox_argb;

@@ -51,7 +59,7 @@ class Hud
Inventory *inventory);
~Hud();

void toggleBlockBounds();
enum BlockBoundsMode toggleBlockBounds();
void disableBlockBounds();
void drawBlockBounds();

@@ -127,14 +135,6 @@ class Hud

scene::SMeshBuffer m_rotation_mesh_buffer;

enum BlockBoundsMode
{
BLOCK_BOUNDS_OFF,
BLOCK_BOUNDS_CURRENT,
BLOCK_BOUNDS_ALL,
BLOCK_BOUNDS_MAX
} m_block_bounds_mode = BLOCK_BOUNDS_OFF;

enum
{
HIGHLIGHT_BOX,

0 comments on commit 6fd8aed

Please sign in to comment.