X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fttt.qc;h=b5248467f5908d8aca373cca211c87cc6f204726;hp=8c5005ed259f301e924a19c781ec2080db2e064a;hb=fc15d72b041c9a748b605ba28735380fbe5b5b01;hpb=03f978544a8b13a18cef1c7cc3dbcaba1c3aee4c

diff --git a/qcsrc/common/minigames/minigame/ttt.qc b/qcsrc/common/minigames/minigame/ttt.qc
index 8c5005ed2..b5248467f 100644
--- a/qcsrc/common/minigames/minigame/ttt.qc
+++ b/qcsrc/common/minigames/minigame/ttt.qc
@@ -25,11 +25,11 @@ const int TTT_TILE_SIZE = 3;
 // find tic tac toe piece given its tile name
 entity ttt_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;
 }
 
 // Checks if the given piece completes a row
@@ -120,7 +120,7 @@ void ttt_next_match(entity minigame, entity player)
 		minigame.minigame_flags = TTT_TURN_PLACE | minigame.ttt_nexteam;
 		minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
 		minigame.ttt_npieces = 0;
-		entity e = world;
+		entity e = NULL;
 		while ( ( e = findentity(e,owner,minigame) ) )
 			if ( e.classname == "minigame_board_piece" )
 				remove(e);
@@ -142,7 +142,7 @@ int ttt_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")
 			{
@@ -295,7 +295,7 @@ void ttt_hud_status(vector pos, vector mySize)
 			if ( e.team == 2 )
 				mypos_y  += player_fontsize_y + ts_y;
 			minigame_drawcolorcodedstring_trunc(mySize_x,mypos,
-				(e.minigame_playerslot ? GetPlayerName(e.minigame_playerslot-1) : _("AI")),
+				(e.minigame_playerslot ? entcs_GetName(e.minigame_playerslot-1) : _("AI")),
 				player_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 
 			mypos_y += player_fontsize_y;
@@ -417,7 +417,7 @@ int ttt_ai_random(int piecemask)
 	for ( int i = 0; i < 9; i++ )
 	{
 		if ( piecemask & f )
-			RandomSelection_Add(world, f, string_null, 1, 1);
+			RandomSelection_Add(NULL, f, string_null, 1, 1);
 		f <<= 1;
 	}
 
@@ -469,7 +469,7 @@ void ttt_aimove(entity minigame)
 {
 	if ( minigame.minigame_flags == (TTT_TURN_PLACE|minigame.ttt_ai) )
 	{
-		entity aiplayer = world;
+		entity aiplayer = NULL;
 		while ( ( aiplayer = findentity(aiplayer,owner,minigame) ) )
 			if ( aiplayer.classname == "minigame_player" && !aiplayer.minigame_playerslot )
 				break;
@@ -642,8 +642,7 @@ int ttt_client_event(entity minigame, string event, ...)
 
 					if ( spawnai )
 					{
-						entity aiplayer = spawn();
-						aiplayer.classname = "minigame_player";
+						entity aiplayer = new(minigame_player);
 						aiplayer.owner = minigame;
 						aiplayer.team = ai;
 						aiplayer.minigame_playerslot = 0;