X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fsv_minigames.qc;h=033a524fb3cf896b7c26e928a3634cb75637b625;hb=90b55a65862014d4147a4cc951e2c89e1139cb4e;hp=689ce83d0295968e7e1ede2e3923fdeb4ed53465;hpb=f6dd336135aa93ee4617df2389c3bfb28f0e1c58;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc
index 689ce83d0..033a524fb 100644
--- a/qcsrc/common/minigames/sv_minigames.qc
+++ b/qcsrc/common/minigames/sv_minigames.qc
@@ -1,3 +1,4 @@
+#include "sv_minigames.qh"
 #include "minigames.qh"
 
 void player_clear_minigame(entity player)
@@ -5,9 +6,9 @@ void player_clear_minigame(entity player)
 	player.active_minigame = NULL;
 	player.minigame_players = NULL;
 	if ( IS_PLAYER(player) )
-		player.movetype = MOVETYPE_WALK;
+		set_movetype(player, MOVETYPE_WALK);
 	else
-		player.movetype = MOVETYPE_FLY_WORLDONLY;
+		set_movetype(player, MOVETYPE_FLY_WORLDONLY);
 	player.team_forced = 0;
 }
 
@@ -27,7 +28,7 @@ void minigame_rmplayer(entity minigame_session, entity player)
 		GameLogEcho(strcat(":minigame:part:",minigame_session.netname,":",
 			ftos(etof(player)),":",player.netname));
 		minigame_session.minigame_players = p.list_next;
-		remove ( p );
+		delete ( p );
 		player_clear_minigame(player);
 	}
 	else
@@ -40,7 +41,7 @@ void minigame_rmplayer(entity minigame_session, entity player)
 				GameLogEcho(strcat(":minigame:part:",minigame_session.netname,":",
 					ftos(etof(player)),":",player.netname));
 				p.list_next = e.list_next;
-				remove(e);
+				delete(e);
 				player_clear_minigame(player);
 				return;
 			}
@@ -112,11 +113,11 @@ void minigame_resend(entity minigame)
 	}
 }
 
-bool minigame_CheckSend(entity this)
+bool minigame_CheckSend(entity this, entity client)
 {
 	entity e;
 	for ( e = this.owner.minigame_players; e != NULL; e = e.list_next )
-		if ( e.minigame_players == other )
+		if ( e.minigame_players == client )
 			return true;
 	return false;
 }
@@ -153,7 +154,7 @@ int minigame_addplayer(entity minigame_session, entity player)
 
 		minigame_resend(minigame_session);
 	}
-	else { remove(player_pointer); }
+	else { delete(player_pointer); }
 	GameLogEcho(strcat(":minigame:join",(mgteam?"":"fail"),":",minigame_session.netname,":",
 		ftos(etof(player)),":",player.netname));
 
@@ -176,7 +177,7 @@ entity start_minigame(entity player, string minigame )
 		GameLogEcho(strcat(":minigame:start:",minig.netname));
 		if ( ! minigame_addplayer(minig,player) )
 		{
-			LOG_TRACE("Minigame ",minig.netname," rejected the first player join!\n");
+			LOG_TRACE("Minigame ",minig.netname," rejected the first player join!");
 			end_minigame(minig);
 			return NULL;
 		}
@@ -235,8 +236,8 @@ void end_minigame(entity minigame_session)
 	while( (e = findentity(e, owner, minigame_session)) )
 		if ( e.minigame_autoclean )
 		{
-			LOG_TRACE("SV Auto-cleaned: ",ftos(etof(e)), " (",e.classname,")\n");
-			remove(e);
+			LOG_TRACE("SV Auto-cleaned: ",ftos(etof(e)), " (",e.classname,")");
+			delete(e);
 		}
 
 	entity p;
@@ -244,11 +245,11 @@ void end_minigame(entity minigame_session)
 	{
 		p = e.list_next;
 		player_clear_minigame(e.minigame_players);
-		remove(e);
+		delete(e);
 	}
 
 	strunzone(minigame_session.netname);
-	remove(minigame_session);
+	delete(minigame_session);
 }
 
 void end_minigames()
@@ -263,7 +264,7 @@ string invite_minigame(entity inviter, entity player)
 {
 	if ( !inviter || !inviter.active_minigame )
 		return "Invalid minigame";
-	if ( !VerifyClientEntity(player, true, false) )
+	if ( VerifyClientEntity(player, true, false) <= 0 )
 		return "Invalid player";
 	if ( inviter == player )
 		return "You can't invite yourself";