Merge branch 'master' into Mario/qc_camstuff

[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 55f4a81a73b9a6b88de39ca567ca48e0537d2081..8ab37af13c8d26ad260238805cf2d4a287f431de 100644 (file)
--- a/qcsrc/common/minigames/minigame/bd.qc
+++ b/qcsrc/common/minigames/minigame/bd.qc
@@ -420,7 +420,7 @@ void bd_editor_place(entity minigame, entity player, string pos, int thetile, st
                                if(!piece)
                                        return; // how?!
 
-                               if(piece.netname) { strunzone(piece.netname); }
+                               strfree(piece.netname);
                                delete(piece);
                                minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
                                return;
@@ -486,12 +486,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); }
+               strfree(targ.netname);
                delete(targ);
        }
        else if(piece && thetype == piece.bd_tiletype)
        {
-               if(piece.netname) { strunzone(piece.netname); }
+               strfree(piece.netname);
                delete(piece);
        }
        else return;
@@ -566,7 +566,7 @@ void bd_setup_pieces(entity minigame)
        while( (e = findentity(e, owner, minigame)) )
                if(e.classname == "minigame_board_piece")
                {
-                       if(e.netname) { strunzone(e.netname); }
+                       strfree(e.netname);
                        delete(e);
                }
        e = NULL;
@@ -727,11 +727,13 @@ bool bd_save_level(entity minigame)
                int target_count = 0, boulder_count = 0;
                entity piece = NULL;
                while((piece = findentity(piece,owner,minigame)))
-               if(piece.classname == "minigame_board_piece")
-                       if(piece.bd_tiletype == BD_TILE_BOULDER)
-                               ++boulder_count;
-                       else if(piece.bd_tiletype == BD_TILE_TARGET)
-                               ++target_count;
+                       if(piece.classname == "minigame_board_piece")
+                       {
+                               if(piece.bd_tiletype == BD_TILE_BOULDER)
+                                       ++boulder_count;
+                               else if(piece.bd_tiletype == BD_TILE_TARGET)
+                                       ++target_count;
+                       }
 
                if(boulder_count != target_count)
                {
@@ -861,7 +863,7 @@ int bd_server_event(entity minigame, string event, ...)
                        while( (e = findentity(e, owner, minigame)) )
                        if(e.classname == "minigame_board_piece")
                        {
-                               if(e.netname) { strunzone(e.netname); }
+                               strfree(e.netname);
                                delete(e);
                        }
                        e = NULL;
@@ -871,8 +873,8 @@ int bd_server_event(entity minigame, string event, ...)
                                delete(e);
                        }
 
-                       if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
-                       if(minigame.bd_levelname) { strunzone(minigame.bd_levelname); }
+                       strfree(minigame.bd_nextlevel);
+                       strfree(minigame.bd_levelname);
                        return false;
                }
                case "join":
@@ -1162,10 +1164,12 @@ string bd_turn_to_string(int turnflags)
                return _("Better luck next time!");
 
        if ( turnflags & BD_TURN_WIN )
+       {
                if(random() > 0.5)
                        return _("Tubular! Press \"Next Level\" to continue!");
                else
                        return _("Wicked! Press \"Next Level\" to continue!");
+       }
 
        if( turnflags & BD_TURN_EDIT )
                return _("Press the space bar to change your currently selected tile");
@@ -1203,8 +1207,7 @@ void bd_editor_fill(entity minigame)
 
 void bd_set_curr_pos(string s)
 {
-       if ( bd_curr_pos )
-               strunzone(bd_curr_pos);
+       strfree(bd_curr_pos);
        if ( s )
                s = strzone(s);
        bd_curr_pos = s;
@@ -1371,7 +1374,7 @@ int bd_client_event(entity minigame, string event, ...)
                                {
                                        sent.message = bd_turn_to_string(sent.minigame_flags);
                                        //if ( sent.minigame_flags & minigame_self.team )
-                                               minigame_prompt();
+                                               //minigame_prompt();
                                }
                        }
                        else if(sent.classname == "minigame_board_piece")