From: Mario <mario.mario@y7mail.com>
Date: Wed, 1 Apr 2020 17:04:17 +0000 (+1000)
Subject: Add a placeholder effect for keyhunt captures until engine issue #123 can be resolved
X-Git-Tag: xonotic-v0.8.5~1135
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f8b0143e780ba99fb09a8e90d30bf71923c2660;p=xonotic%2Fxonotic-data.pk3dir.git

Add a placeholder effect for keyhunt captures until engine issue #123 can be resolved
---

diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
index 1240ee497..5d52ed7cb 100644
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
@@ -541,7 +541,12 @@ void kh_WinnerTeam(int winner_team)  // runs when a team wins
 		midpoint += thisorigin;
 
 		if(!first)
-			te_lightning2(NULL, lastorigin, thisorigin);
+		{
+			// TODO: this effect has been replaced due to a possible crash it causes
+			// see https://gitlab.com/xonotic/darkplaces/issues/123
+			//te_lightning2(NULL, lastorigin, thisorigin);
+			Send_Effect(EFFECT_TR_NEXUIZPLASMA, lastorigin, thisorigin, 1);
+		}
 		lastorigin = thisorigin;
 		if(first)
 			firstorigin = thisorigin;
@@ -549,7 +554,8 @@ void kh_WinnerTeam(int winner_team)  // runs when a team wins
 	}
 	if(NumTeams(kh_teams) > 2)
 	{
-		te_lightning2(NULL, lastorigin, firstorigin);
+		//te_lightning2(NULL, lastorigin, firstorigin); // TODO see above
+		Send_Effect(EFFECT_TR_NEXUIZPLASMA, lastorigin, firstorigin, 1);
 	}
 	midpoint = midpoint * (1 / NumTeams(kh_teams));
 	te_customflash(midpoint, 1000, 1, Team_ColorRGB(winner_team) * 0.5 + '0.5 0.5 0.5');  // make the color >=0.5 in each component