Allow placing and controlling more than one dozer

[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 ed84b6469c33c56b79eda5592d92c51206fe0228..3483f93df0579cd07f98e7ac4fd259e4c6737b4e 100644 (file)
--- a/qcsrc/common/minigames/minigame/bd.qc
+++ b/qcsrc/common/minigames/minigame/bd.qc
@@ -191,16 +191,26 @@ void bd_move(entity minigame, entity player, string dir)
                        int dx = bound(-1, dxs, 1);
                        int dy = bound(-1, dys, 1);
 
-                       dozer.bd_dir_x = dx;
-                       dozer.bd_dir_y = dy;
-                       dozer.bd_dir_z = 0;
+                       int moved = 0;
+                       entity e = world;
+                       while ( ( e = findentity(e,owner,minigame) ) )
+                               if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_DOZER )
+                               {
+                                       e.bd_dir_x = dx;
+                                       e.bd_dir_y = dy;
+                                       e.bd_dir_z = 0;
+
+                                       if(bd_move_dozer(minigame, e))
+                                               ++moved;
+
+                                       minigame_server_sendflags(e,MINIG_SF_UPDATE); // update anyway
+                               }
 
-                       if(bd_move_dozer(minigame, dozer))
+                       if(moved)
                                player.bd_moves++;
 
                        bd_check_winner(minigame);
 
-                       minigame_server_sendflags(dozer,MINIG_SF_UPDATE); // update anyway
                        minigame_server_sendflags(player,BD_SF_PLAYERMOVES);
                        minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
                }
@@ -237,9 +247,9 @@ void bd_editor_place(entity minigame, entity player, string pos, int thetile, st
                                return;
                        }
 
-                       entity dozer = bd_find_dozer(minigame);
-                       if(dozer && thetile == BD_TILE_DOZER && pos != dozer.netname)
-                               return; // nice try
+                       //entity dozer = bd_find_dozer(minigame);
+                       //if(dozer && thetile == BD_TILE_DOZER && pos != dozer.netname)
+                               //return; // nice try
 
                        if(found_piece || (targ && thetile != BD_TILE_BOULDER))
                        {
@@ -320,6 +330,14 @@ void bd_unfill_recurse(entity minigame, entity player, int thetype, int letter,
 
 void bd_do_fill(entity minigame, entity player, string dir, string thetile)
 {
+#ifdef SVQC
+       if(!player.minigame_players.bd_canedit)
+       {
+               sprint(player.minigame_players, "You're not allowed to edit levels, sorry!\n");
+               return;
+       }
+#endif
+
        if(minigame.minigame_flags & BD_TURN_EDIT)
        {
                int thetype = stof(thetile);
@@ -561,8 +579,16 @@ void bd_load_level(entity minigame)
        fclose(file_get);
 }
 
-void bd_close_editor(entity minigame)
+void bd_close_editor(entity minigame, entity player)
 {
+#ifdef SVQC
+       if(!player.minigame_players.bd_canedit)
+       {
+               sprint(player.minigame_players, "You're not allowed to edit levels, sorry!\n");
+               return;
+       }
+#endif
+
        entity dozer = bd_find_dozer(minigame);
        if(!dozer)
        {
@@ -595,7 +621,7 @@ int bd_server_event(entity minigame, string event, ...)
                        minigame.bd_levelname = strzone(autocvar_sv_minigames_bulldozer_startlevel);
                        bd_setup_pieces(minigame);
                        minigame.minigame_flags = BD_TURN_MOVE;
-                       
+
                        return true;
                }
                case "end":
@@ -625,7 +651,7 @@ int bd_server_event(entity minigame, string event, ...)
                        switch(argv(0))
                        {
                                case "move":
-                                       bd_do_move(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null), ((...(1,int)) >= 4 ? argv(3) : string_null)); 
+                                       bd_do_move(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null), ((...(1,int)) >= 4 ? argv(3) : string_null));
                                        return true;
                                case "next":
                                        bd_next_match(minigame,...(0,entity), ((...(1,int) >= 2 ? argv(1) : string_null)));
@@ -637,10 +663,10 @@ int bd_server_event(entity minigame, string event, ...)
                                        bd_activate_editor(minigame,...(0,entity));
                                        return true;
                                case "save":
-                                       bd_close_editor(minigame);
+                                       bd_close_editor(minigame,...(0,entity));
                                        return true;
                                case "fill":
-                                       bd_do_fill(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null)); 
+                                       bd_do_fill(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null));
                                        return true;
                        }
 
@@ -672,7 +698,7 @@ int bd_server_event(entity minigame, string event, ...)
                        return false;
                }
        }
-       
+
        return false;
 }
 
@@ -714,7 +740,7 @@ void bd_hud_board(vector pos, vector mySize)
        minigame_hud_fitsqare(pos, mySize);
        bd_boardpos = pos;
        bd_boardsize = mySize;
-       
+
        minigame_hud_simpleboard(pos,mySize,minigame_texture("bd/board"));
 
        vector tile_size = minigame_hud_denormalize_size('1 1 0' / BD_TILE_SIZE,pos,mySize);
@@ -751,10 +777,10 @@ void bd_hud_board(vector pos, vector mySize)
                                if(e.bd_enemy)
                                        thepiece = "bd/boulder_target";
 
-                               minigame_drawpic_centered( tile_pos,  
+                               minigame_drawpic_centered( tile_pos,
                                                minigame_texture(thepiece),
                                                tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
-                       }       
+                       }
                }
        }
 
@@ -809,17 +835,17 @@ void bd_hud_board(vector pos, vector mySize)
 
                if(active_minigame.minigame_flags & BD_TURN_WIN)
                        victory_text = "Well done! Click 'Next Level' to continue";
-               
+
                vector win_pos = pos+eY*(mySize_y-winfs_y)/2;
                vector win_sz;
                win_sz = minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos,
-                       sprintf("%s", victory_text), 
+                       sprintf("%s", victory_text),
                        winfs, 0, DRAWFLAG_NORMAL, 0.5);
-               
+
                drawfill(win_pos-eY*hud_fontsize_y,win_sz+2*eY*hud_fontsize_y,'0.3 0.3 1',0.8,DRAWFLAG_ADDITIVE);
-               
+
                minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos,
-                       sprintf("%s", victory_text), 
+                       sprintf("%s", victory_text),
                        winfs, panel_fg_alpha, DRAWFLAG_NORMAL, 0.5);
        }
 }
@@ -890,7 +916,7 @@ string bd_turn_to_string(int turnflags)
 
        if ( turnflags & BD_TURN_MOVE )
                return _("Push the boulders onto the targets");
-       
+
        return "";
 }