X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fpp.qc;h=7d4048d61b58bcd2de5c21520286fb6ec3105a31;hb=8e0690ba978a6a0c7287bc3cfa2873a05b15fc5f;hp=24c61c01000e4f93cfa34f269847657d5c295858;hpb=f52ddede69621c7c9d31983591902f47fd40d7d0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/minigames/minigame/pp.qc b/qcsrc/common/minigames/minigame/pp.qc index 24c61c010..7d4048d61 100644 --- a/qcsrc/common/minigames/minigame/pp.qc +++ b/qcsrc/common/minigames/minigame/pp.qc @@ -29,11 +29,11 @@ const int PP_TILE_SIZE = 7; // find tic tac toe piece given its tile name entity pp_find_piece(entity minig, string tile) { - entity e = world; + entity e = NULL; while ( ( e = findentity(e,owner,minig) ) ) if ( e.classname == "minigame_board_piece" && e.netname == tile ) return e; - return world; + return NULL; } // check if the tile name is valid (3x3 grid) @@ -164,7 +164,7 @@ void pp_setup_pieces(entity minigame) } } - minigame.pp_curr_piece = world; + minigame.pp_curr_piece = NULL; } // request a new match @@ -183,7 +183,7 @@ void pp_next_match(entity minigame, entity player) { minigame.minigame_flags = PP_TURN_PLACE | minigame.pp_nexteam; minigame_server_sendflags(minigame,MINIG_SF_UPDATE); - entity e = world; + entity e = NULL; while ( ( e = findentity(e,owner,minigame) ) ) if ( e.classname == "minigame_board_piece" ) remove(e); @@ -210,7 +210,7 @@ int pp_server_event(entity minigame, string event, ...) } case "end": { - entity e = world; + entity e = NULL; while( (e = findentity(e, owner, minigame)) ) if(e.classname == "minigame_board_piece") { @@ -285,7 +285,7 @@ void pp_hud_board(vector pos, vector mySize) vector tile_size = minigame_hud_denormalize_size('1 1 0'/PP_TILE_SIZE,pos,mySize); vector tile_pos; - active_minigame.pp_curr_piece = world; + active_minigame.pp_curr_piece = NULL; entity e; FOREACH_MINIGAME_ENTITY(e) if(e.classname == "minigame_board_piece") @@ -374,7 +374,6 @@ void pp_hud_board(vector pos, vector mySize) // Required function, draw the game status panel void pp_hud_status(vector pos, vector mySize) { - HUD_Scale_Disable(); HUD_Panel_DrawBg(1); vector ts; ts = minigame_drawstring_wrapped(mySize_x,pos,active_minigame.descriptor.message,