]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/minigames/minigame/bd.qc
Merge branch 'master' into terencehill/hud_updates
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / minigame / bd.qc
index ed84b6469c33c56b79eda5592d92c51206fe0228..31ae9d947912f993571072e8ed89ab551ecfa302 100644 (file)
@@ -1,3 +1,4 @@
+#include "bd.qh"
 REGISTER_MINIGAME(bd, "Bulldozer");
 
 const int BD_TURN_MOVE  = 0x0100; // player must move the bulldozer
@@ -46,11 +47,11 @@ string autocvar_sv_minigames_bulldozer_startlevel = "level1";
 // find same game piece given its tile name
 entity bd_find_piece(entity minig, string tile, bool check_target)
 {
-       entity e = world;
+       entity e = NULL;
        while ( ( e = findentity(e,owner,minig) ) )
                if ( e.classname == "minigame_board_piece" && e.netname == tile && ((check_target) ? e.bd_tiletype == BD_TILE_TARGET : e.bd_tiletype != BD_TILE_TARGET) )
                        return e;
-       return world;
+       return NULL;
 }
 
 // check if the tile name is valid (15x15 grid)
@@ -65,17 +66,17 @@ bool bd_valid_tile(string tile)
 
 entity bd_find_dozer(entity minig)
 {
-       entity e = world;
+       entity e = NULL;
        while ( ( e = findentity(e,owner,minig) ) )
                if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_DOZER )
                        return e;
-       return world;
+       return NULL;
 }
 
 void bd_check_winner(entity minig)
 {
        int total = 0, valid = 0;
-       entity e = world;
+       entity e = NULL;
        while ( ( e = findentity(e,owner,minig) ) )
                if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_TARGET )
                {
@@ -191,16 +192,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 = NULL;
+                       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 +248,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))
                        {
@@ -249,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;
                        }
@@ -303,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;
 
@@ -320,6 +331,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);
@@ -357,7 +376,7 @@ void bd_reset_moves(entity minigame)
 #ifdef SVQC
        for(e = minigame.minigame_players; e; e = e.list_next)
 #elif defined(CSQC)
-       e = world;
+       e = NULL;
        while( (e = findentity(e,owner,minigame)) )
                if ( e.classname == "minigame_player" )
 #endif
@@ -370,12 +389,12 @@ void bd_reset_moves(entity minigame)
 void bd_load_level(entity minigame);
 void bd_setup_pieces(entity minigame)
 {
-       entity e = world;
+       entity e = NULL;
        while( (e = findentity(e, owner, minigame)) )
                if(e.classname == "minigame_board_piece")
                {
                        if(e.netname) { strunzone(e.netname); }
-                       remove(e);
+                       delete(e);
                }
 
        bd_load_level(minigame);
@@ -485,7 +504,7 @@ bool bd_save_level(entity minigame)
        if(minigame.bd_levelname && minigame.bd_levelname != "")
        {
                int target_count = 0, boulder_count = 0;
-               entity piece = world;
+               entity piece = NULL;
                while((piece = findentity(piece,owner,minigame)))
                if(piece.classname == "minigame_board_piece")
                        if(piece.bd_tiletype == BD_TILE_BOULDER)
@@ -510,7 +529,7 @@ bool bd_save_level(entity minigame)
                if(minigame.bd_nextlevel && minigame.bd_nextlevel != "" && fexists(strcat("minigames/bulldozer/storage_", minigame.bd_nextlevel, ".txt")))
                        fputs(file_get, strcat("nextlevel = \"", minigame.bd_nextlevel, "\"\n"));
 
-               entity e = world;
+               entity e = NULL;
                while ( ( e = findentity(e,owner,minigame) ) )
                if ( e.classname == "minigame_board_piece" )
                {
@@ -561,8 +580,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,17 +622,17 @@ 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":
                {
-                       entity e = world;
+                       entity e = NULL;
                        while( (e = findentity(e, owner, minigame)) )
                        if(e.classname == "minigame_board_piece")
                        {
                                if(e.netname) { strunzone(e.netname); }
-                               remove(e);
+                               delete(e);
                        }
 
                        if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
@@ -625,7 +652,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 +664,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 +699,7 @@ int bd_server_event(entity minigame, string event, ...)
                        return false;
                }
        }
-       
+
        return false;
 }
 
@@ -714,7 +741,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);
@@ -727,13 +754,13 @@ void bd_hud_board(vector pos, vector mySize)
                {
                        if(e.bd_tiletype == BD_TILE_TARGET)
                        {
-                               e.bd_enemy = world;
+                               e.bd_enemy = NULL;
                                e.bd_enemy = bd_find_piece(active_minigame, e.netname, false);
                        }
                        else if(e.bd_tiletype == BD_TILE_BOULDER)
                        {
                                e.bd_hide = false; // reset either way
-                               e.bd_hide = ((bd_find_piece(active_minigame, e.netname, true)) != world);
+                               e.bd_hide = ((bd_find_piece(active_minigame, e.netname, true)) != NULL);
                        }
                }
        }
@@ -751,10 +778,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 +836,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);
        }
 }
@@ -828,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);
@@ -890,7 +917,7 @@ string bd_turn_to_string(int turnflags)
 
        if ( turnflags & BD_TURN_MOVE )
                return _("Push the boulders onto the targets");
-       
+
        return "";
 }