Merge branch 'master' into terencehill/hud_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / minigame / bd.qc

diff --git a/qcsrc/common/minigames/minigame/bd.qc b/qcsrc/common/minigames/minigame/bd.qc
index db25c2959e02470d85a6b5d3b23b022f24488d6a..31ae9d947912f993571072e8ed89ab551ecfa302 100644 (file)
--- a/qcsrc/common/minigames/minigame/bd.qc
+++ b/qcsrc/common/minigames/minigame/bd.qc
@@ -1,3 +1,4 @@
+#include "bd.qh"
 REGISTER_MINIGAME(bd, "Bulldozer");
 
 const int BD_TURN_MOVE  = 0x0100; // player must move the bulldozer
@@ -259,7 +260,7 @@ void bd_editor_place(entity minigame, entity player, string pos, int thetile, st
                                        return; // how?!
 
                                if(piece.netname) { strunzone(piece.netname); }
-                               remove(piece);
+                               delete(piece);
                                minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
                                return;
                        }
@@ -313,12 +314,12 @@ void bd_unfill_recurse(entity minigame, entity player, int thetype, int letter,
        if(targ && thetype == targ.bd_tiletype)
        {
                if(targ.netname) { strunzone(targ.netname); }
-               remove(targ);
+               delete(targ);
        }
        else if(piece && thetype == piece.bd_tiletype)
        {
                if(piece.netname) { strunzone(piece.netname); }
-               remove(piece);
+               delete(piece);
        }
        else return;
 
@@ -393,7 +394,7 @@ void bd_setup_pieces(entity minigame)
                if(e.classname == "minigame_board_piece")
                {
                        if(e.netname) { strunzone(e.netname); }
-                       remove(e);
+                       delete(e);
                }
 
        bd_load_level(minigame);
@@ -631,7 +632,7 @@ int bd_server_event(entity minigame, string event, ...)
                        if(e.classname == "minigame_board_piece")
                        {
                                if(e.netname) { strunzone(e.netname); }
-                               remove(e);
+                               delete(e);
                        }
 
                        if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
@@ -854,7 +855,7 @@ void bd_hud_board(vector pos, vector mySize)
 // Required function, draw the game status panel
 void bd_hud_status(vector pos, vector mySize)
 {
-       HUD_Panel_DrawBg(1);
+       HUD_Panel_DrawBg();
        vector ts;
        ts = minigame_drawstring_wrapped(mySize_x,pos,active_minigame.descriptor.message,
                hud_fontsize * 2, '0.25 0.47 0.72', panel_fg_alpha, DRAWFLAG_NORMAL,0.5);