X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_lms.qc;h=c3c24559e34bc76e112a3c001383df57f7e54407;hb=b39c34ddf85197bc841a9bf730fe60f7b559b39e;hp=d7edf0442d7ff0efcd575804ac3b1345ad884849;hpb=2acb480d08d206ebefcf39704919e7c5b72c94e1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qc b/qcsrc/server/mutators/mutator/gamemode_lms.qc
index d7edf0442..c3c24559e 100644
--- a/qcsrc/server/mutators/mutator/gamemode_lms.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc
@@ -72,7 +72,10 @@ int WinningCondition_LMS()
 				// a winner!
 				// and assign him his first place
 				PlayerScore_Add(head, SP_LMS_RANK, 1);
-				return WINNING_YES;
+				if(warmup_stage)
+					return WINNING_NO;
+				else
+					return WINNING_YES;
 			}
 		}
 	}
@@ -114,8 +117,12 @@ MUTATOR_HOOKFUNCTION(lms, reset_map_global)
 
 MUTATOR_HOOKFUNCTION(lms, reset_map_players)
 {
-	if(restart_mapalreadyrestarted || (time < game_starttime))
-	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(PlayerScore_Add(it, SP_LMS_LIVES, LMS_NewPlayerLives())));
+	FOREACH_CLIENT(true, {
+		TRANSMUTE(Player, it);
+		it.frags = FRAGS_PLAYER;
+		PlayerScore_Add(it, SP_LMS_LIVES, LMS_NewPlayerLives());
+		PutClientInServer(it);
+	});
 }
 
 MUTATOR_HOOKFUNCTION(lms, PutClientInServer)
@@ -131,6 +138,8 @@ MUTATOR_HOOKFUNCTION(lms, PutClientInServer)
 			lms_lowest_lives = tl;
 		if(tl <= 0)
 			TRANSMUTE(Observer, player);
+		if(warmup_stage)
+			PlayerScore_Add(player, SP_LMS_RANK, -PlayerScore_Add(player, SP_LMS_RANK, 0));
 	}
 }
 
@@ -138,6 +147,8 @@ MUTATOR_HOOKFUNCTION(lms, ForbidSpawn)
 {
 	entity player = M_ARGV(0, entity);
 
+	if(warmup_stage)
+		return false;
 	if(player.frags == FRAGS_SPECTATOR)
 		return true;
 	if(PlayerScore_Add(player, SP_LMS_LIVES, 0) <= 0)
@@ -157,6 +168,7 @@ MUTATOR_HOOKFUNCTION(lms, PlayerDies)
 
 void lms_RemovePlayer(entity player)
 {
+	static int quitters = 0;
 	float player_rank = PlayerScore_Add(player, SP_LMS_RANK, 0);
 	if (!player_rank)
 	{
@@ -164,6 +176,8 @@ void lms_RemovePlayer(entity player)
 		FOREACH_CLIENT(IS_PLAYER(it), { pl_cnt++; });
 		if (player.lms_spectate_warning != 2)
 		{
+			if(IS_BOT_CLIENT(player))
+				bot_clear(player);
 			player.frags = FRAGS_LMS_LOSER;
 			PlayerScore_Add(player, SP_LMS_RANK, pl_cnt + 1);
 		}
@@ -174,7 +188,7 @@ void lms_RemovePlayer(entity player)
 				if (it.frags == FRAGS_LMS_LOSER)
 				{
 					float it_rank = PlayerScore_Add(it, SP_LMS_RANK, 0);
-					if (it_rank > player_rank && it_rank < 665)
+					if (it_rank > player_rank && it_rank <= 256)
 						PlayerScore_Add(it, SP_LMS_RANK, -1);
 					lms_lowest_lives = 0;
 				}
@@ -185,12 +199,16 @@ void lms_RemovePlayer(entity player)
 						lms_lowest_lives = tl;
 				}
 			});
-			PlayerScore_Add(player, SP_LMS_LIVES, -PlayerScore_Add(player, SP_LMS_LIVES, 0));
-			PlayerScore_Add(player, SP_LMS_RANK, 665); // different from 666
+			PlayerScore_Add(player, SP_LMS_RANK, 665 - quitters); // different from 666
+			if(!warmup_stage)
+			{
+				PlayerScore_Add(player, SP_LMS_LIVES, -PlayerScore_Add(player, SP_LMS_LIVES, 0));
+				++quitters;
+			}
 			player.frags = FRAGS_LMS_LOSER;
 			TRANSMUTE(Observer, player);
 		}
-		if (pl_cnt == 2) // a player is forfeiting leaving only one player
+		if (pl_cnt == 2 && !warmup_stage) // a player is forfeiting leaving only one player
 			lms_lowest_lives = 0; // end the game now!
 	}
 
@@ -255,17 +273,21 @@ MUTATOR_HOOKFUNCTION(lms, GiveFragsForKill)
 {
 	entity frag_target = M_ARGV(1, entity);
 
-	// remove a life
-	float tl;
-	tl = PlayerScore_Add(frag_target, SP_LMS_LIVES, -1);
-	if(tl < lms_lowest_lives)
-		lms_lowest_lives = tl;
-	if(tl <= 0)
+	if (!warmup_stage)
 	{
-		int pl_cnt = 0;
-		FOREACH_CLIENT(IS_PLAYER(it), { pl_cnt++; });
-		frag_target.frags = FRAGS_LMS_LOSER;
-		PlayerScore_Add(frag_target, SP_LMS_RANK, pl_cnt);
+		// remove a life
+		int tl = PlayerScore_Add(frag_target, SP_LMS_LIVES, -1);
+		if(tl < lms_lowest_lives)
+			lms_lowest_lives = tl;
+		if(tl <= 0)
+		{
+			int pl_cnt = 0;
+			FOREACH_CLIENT(IS_PLAYER(it), { pl_cnt++; });
+			if(IS_BOT_CLIENT(frag_target))
+				bot_clear(frag_target);
+			frag_target.frags = FRAGS_LMS_LOSER;
+			PlayerScore_Add(frag_target, SP_LMS_RANK, pl_cnt);
+		}
 	}
 	M_ARGV(2, float) = 0; // frag score
 
@@ -357,7 +379,7 @@ MUTATOR_HOOKFUNCTION(lms, ClientCommand_Spectate)
 {
     entity player = M_ARGV(0, entity);
 
-	if(player.lms_spectate_warning)
+	if(warmup_stage || player.lms_spectate_warning)
 	{
 		// for the forfeit message...
 		player.lms_spectate_warning = 2;
@@ -392,7 +414,7 @@ MUTATOR_HOOKFUNCTION(lms, GetPlayerStatus)
 
 MUTATOR_HOOKFUNCTION(lms, AddPlayerScore)
 {
-	if(gameover)
+	if(game_stopped)
 	if(M_ARGV(0, entity) == SP_LMS_RANK) // score field
 		return true; // allow writing to this field in intermission as it is needed for newly joining players
 }