Enhance caves for mgv7, add ravines

[minetest.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index e3251bf65c45383089008f233f5771ab48c373ab..189003e4caa262489f84faef07eff6e1d79ba900 100644 (file)
--- 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());
                }
 
                /*