X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Finvasion%2Fsv_invasion.qc;h=4e57a5ef2c5b1c9a378865b40bb344606d3000ce;hp=c9670a150c38d1dac71880355f6ce712b964b5e3;hb=3fc2359b7933352424af07db8f84cbb9342e934f;hpb=a34c7d612200ef8fe04cb9649061b2e4b6fc5703

diff --git a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
index c9670a150..4e57a5ef2 100644
--- a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
+++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
@@ -288,7 +288,7 @@ bool Invasion_CheckWinner()
 
 	float total_alive_monsters = 0, supermonster_count = 0, red_alive = 0, blue_alive = 0, yellow_alive = 0, pink_alive = 0;
 
-	IL_EACH(g_monsters, GetResourceAmount(it, RESOURCE_HEALTH) > 0,
+	IL_EACH(g_monsters, GetResourceAmount(it, RES_HEALTH) > 0,
 	{
 		if((get_monsterinfo(it.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER)
 			++supermonster_count;
@@ -334,14 +334,20 @@ bool Invasion_CheckWinner()
 	{
 		if(red_alive > 0) { winner_team = NUM_TEAM_1; }
 		if(blue_alive > 0)
-		if(winner_team) { winner_team = 0; }
-		else { winner_team = NUM_TEAM_2; }
+		{
+			if(winner_team) { winner_team = 0; }
+			else { winner_team = NUM_TEAM_2; }
+		}
 		if(yellow_alive > 0)
-		if(winner_team) { winner_team = 0; }
-		else { winner_team = NUM_TEAM_3; }
+		{
+			if(winner_team) { winner_team = 0; }
+			else { winner_team = NUM_TEAM_3; }
+		}
 		if(pink_alive > 0)
-		if(winner_team) { winner_team = 0; }
-		else { winner_team = NUM_TEAM_4; }
+		{
+			if(winner_team) { winner_team = 0; }
+			else { winner_team = NUM_TEAM_4; }
+		}
 	}
 	else
 	{
@@ -429,13 +435,15 @@ MUTATOR_HOOKFUNCTION(inv, MonsterDies)
 		if(teamplay) { inv_monsters_perteam[frag_target.team] -= 1; }
 
 		if(IS_PLAYER(frag_attacker))
-		if(SAME_TEAM(frag_attacker, frag_target)) // in non-teamplay modes, same team = same player, so this works
-			GameRules_scoring_add(frag_attacker, KILLS, -1);
-		else
 		{
-			GameRules_scoring_add(frag_attacker, KILLS, +1);
-			if(teamplay)
-				TeamScore_AddToTeam(frag_attacker.team, ST_INV_KILLS, +1);
+			if(SAME_TEAM(frag_attacker, frag_target)) // in non-teamplay modes, same team = same player, so this works
+				GameRules_scoring_add(frag_attacker, KILLS, -1);
+			else
+			{
+				GameRules_scoring_add(frag_attacker, KILLS, +1);
+				if(teamplay)
+					TeamScore_AddToTeam(frag_attacker.team, ST_INV_KILLS, +1);
+			}
 		}
 	}
 }