X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fpp.qc;h=e05658cbf2c0b486f9ccdbeb01e2a53517c2b91b;hp=3ef2124dcac1b72aa7a27a84e6a21bcea136c115;hb=c039d054a46888048d214000273ccfc63e4611b6;hpb=18e2cd311a581f77ba8eb9c5421dd219ff5d760d

diff --git a/qcsrc/common/minigames/minigame/pp.qc b/qcsrc/common/minigames/minigame/pp.qc
index 3ef2124dca..e05658cbf2 100644
--- a/qcsrc/common/minigames/minigame/pp.qc
+++ b/qcsrc/common/minigames/minigame/pp.qc
@@ -1,3 +1,4 @@
+#include "pp.qh"
 REGISTER_MINIGAME(pp, "Push-Pull");
 
 const int PP_TURN_PLACE = 0x0100; // player has to place a piece on the board
@@ -29,11 +30,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)
@@ -121,7 +122,7 @@ void pp_move(entity minigame, entity player, string pos )
 			if(existing)
 			{
 				if(existing.netname) { strunzone(existing.netname); }
-				remove(existing);
+				delete(existing);
 			}
 
 			entity piece = msle_spawn(minigame,"minigame_board_piece");
@@ -164,7 +165,7 @@ void pp_setup_pieces(entity minigame)
 		}
 	}
 
-	minigame.pp_curr_piece = world;
+	minigame.pp_curr_piece = NULL;
 }
 
 // request a new match
@@ -183,10 +184,10 @@ 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);
+				delete(e);
 		minigame.pp_team1_score = 0;
 		minigame.pp_team2_score = 0;
 
@@ -210,12 +211,12 @@ 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")
 			{
 				if(e.netname) { strunzone(e.netname); }
-				remove(e);
+				delete(e);
 			}
 			return false;
 		}
@@ -285,7 +286,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")
@@ -354,7 +355,7 @@ void pp_hud_board(vector pos, vector mySize)
 		FOREACH_MINIGAME_ENTITY(e)
 			if ( e.classname == "minigame_player" &&
 					e.team == (active_minigame.minigame_flags & PP_TURN_TEAM) )
-				playername = GetPlayerName(e.minigame_playerslot-1);
+				playername = entcs_GetName(e.minigame_playerslot-1);
 
 		vector win_pos = pos+eY*(mySize_y-winfs_y)/2;
 		vector win_sz;
@@ -374,7 +375,7 @@ void pp_hud_board(vector pos, vector mySize)
 // Required function, draw the game status panel
 void pp_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);
@@ -412,7 +413,7 @@ void pp_hud_status(vector pos, vector mySize)
 			if ( e.team == 2 )
 				mypos_y  += player_fontsize_y + ts_y;
 			minigame_drawcolorcodedstring_trunc(mySize_x,mypos,
-				GetPlayerName(e.minigame_playerslot-1),
+				entcs_GetName(e.minigame_playerslot-1),
 				player_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 
 			mypos_y += player_fontsize_y;