summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-04-25 19:27:22 -0400
committerkwolekr <kwolekr@minetest.net>2013-04-25 19:37:36 -0400
commitd3f0ce62240b7598eded13153eacb410bf2420a1 (patch)
treeb62c13fdf4cae1119084fe466fdc01dbb6a14279 /src/game.cpp
parentd83602d98ed9df6a8b9bc0d68a14b824777e2032 (diff)
downloadminetest-d3f0ce62240b7598eded13153eacb410bf2420a1.tar.gz
minetest-d3f0ce62240b7598eded13153eacb410bf2420a1.tar.bz2
minetest-d3f0ce62240b7598eded13153eacb410bf2420a1.zip
Generalize hud_builtin_enable into hud_set_flags
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e3251bf65..189003e4c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2186,14 +2186,6 @@ void the_game(
delete event.hudchange.v2fdata;
delete event.hudchange.sdata;
}
- else if (event.type == CE_HUD_BUILTIN_ENABLE) {
- u32 bit = (u32)event.hudbuiltin.id;
- u32 mask = 1 << bit;
- if (event.hudbuiltin.flag)
- player->hud_flags |= mask;
- else
- player->hud_flags &= ~mask;
- }
}
}
@@ -3078,7 +3070,7 @@ void the_game(
/*
Wielded tool
*/
- if(show_hud && (player->hud_flags & HUD_DRAW_WIELDITEM))
+ if(show_hud && (player->hud_flags & HUD_FLAG_WIELDITEM_VISIBLE))
{
// Warning: This clears the Z buffer.
camera.drawWieldedTool();
@@ -3102,7 +3094,7 @@ void the_game(
/*
Draw crosshair
*/
- if (show_hud && (player->hud_flags & HUD_DRAW_CROSSHAIR))
+ if (show_hud)
hud.drawCrosshair();
} // timer
@@ -3117,8 +3109,7 @@ void the_game(
if (show_hud)
{
hud.drawHotbar(v2s32(displaycenter.X, screensize.Y),
- client.getHP(), client.getPlayerItem(),
- player->hud_flags);
+ client.getHP(), client.getPlayerItem());
}
/*