X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fctf%2Fsv_ctf.qc;h=937575752af4f2c1547f11ac55c39e0060314505;hp=aa05ea337b9bc2077315d6c94afe1b26f1dbe673;hb=0514f7948727cfa572b33bd29d1bdf2c13cd866d;hpb=185c7b56bb0d8bbb204cbbf0696dd96c069fffc3

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index aa05ea337..937575752 100644
--- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@ -1,7 +1,17 @@
 #include "sv_ctf.qh"
 
 #include <common/effects/all.qh>
+#include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/triggers.qh>
 #include <common/vehicles/all.qh>
+#include <server/command/vote.qh>
+#include <server/client.qh>
+#include <server/gamelog.qh>
+#include <server/intermission.qh>
+#include <server/damage.qh>
+#include <server/world.qh>
+#include <server/items/items.qh>
+#include <server/race.qh>
 #include <server/teamplay.qh>
 
 #include <lib/warpzone/common.qh>
@@ -48,6 +58,8 @@ bool autocvar_g_ctf_flag_return_when_unreachable;
 float autocvar_g_ctf_flag_return_damage;
 float autocvar_g_ctf_flag_return_damage_delay;
 float autocvar_g_ctf_flag_return_dropped;
+bool autocvar_g_ctf_flag_waypoint = true;
+float autocvar_g_ctf_flag_waypoint_maxdistance;
 float autocvar_g_ctf_flagcarrier_auto_helpme_damage;
 float autocvar_g_ctf_flagcarrier_auto_helpme_time;
 float autocvar_g_ctf_flagcarrier_selfdamagefactor;
@@ -436,7 +448,19 @@ void ctf_Handle_Throw(entity player, entity receiver, int droptype)
 	if(!flag) { return; }
 	if((droptype == DROP_PASS) && !receiver) { return; }
 
-	if(flag.speedrunning) { ctf_RespawnFlag(flag); return; }
+	if(flag.speedrunning)
+	{
+		// ensure old waypoints are removed before resetting the flag
+		WaypointSprite_Kill(player.wps_flagcarrier);
+
+		if(player.wps_enemyflagcarrier)
+			WaypointSprite_Kill(player.wps_enemyflagcarrier);
+
+		if(player.wps_flagreturn)
+			WaypointSprite_Kill(player.wps_flagreturn);
+		ctf_RespawnFlag(flag);
+		return;
+	}
 
 	// reset the flag
 	setattachment(flag, NULL, "");
@@ -520,10 +544,12 @@ void ctf_Handle_Throw(entity player, entity receiver, int droptype)
 	ctf_CaptureShield_Update(player, 0); // shield player from picking up flag
 }
 
+#if 0
 void shockwave_spawn(string m, vector org, float sz, float t1, float t2)
 {
 	return modeleffect_spawn(m, 0, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);
 }
+#endif
 
 // ==============
 // Event Handlers
@@ -587,7 +613,9 @@ void ctf_Handle_Capture(entity flag, entity toucher, int capturetype)
 
 	// effects
 	Send_Effect_(flag.capeffect, flag.origin, '0 0 0', 1);
-	//shockwave_spawn("models/ctf/shockwavetransring.md3", flag.origin - '0 0 15', -0.8, 0, 1);
+#if 0
+	shockwave_spawn("models/ctf/shockwavetransring.md3", flag.origin - '0 0 15', -0.8, 0, 1);
+#endif
 
 	// other
 	if(capturetype == CAPTURE_NORMAL)
@@ -1133,6 +1161,7 @@ METHOD(Flag, giveTo, bool(Flag this, entity flag, entity toucher))
 .float last_respawn;
 void ctf_RespawnFlag(entity flag)
 {
+	flag.watertype = CONTENT_EMPTY; // TODO: it is unclear why this workaround is needed, likely many other potential breakage points!!
 	// check for flag respawn being called twice in a row
 	if(flag.last_respawn > time - 0.5)
 		{ backtrace("flag respawn called twice quickly! please notify Samual about this..."); }
@@ -1224,10 +1253,14 @@ void ctf_DelayedFlagSetup(entity this) // called after a flag is placed on a map
 		default: basename = WP_FlagBaseNeutral; break;
 	}
 
-	entity wp = WaypointSprite_SpawnFixed(basename, this.origin + FLAG_WAYPOINT_OFFSET, this, wps_flagbase, RADARICON_FLAG);
-	wp.colormod = ((this.team) ? Team_ColorRGB(this.team) : '1 1 1');
-	WaypointSprite_UpdateTeamRadar(this.wps_flagbase, RADARICON_FLAG, ((this.team) ? colormapPaletteColor(this.team - 1, false) : '1 1 1'));
-	setcefc(wp, ctf_FlagBase_Customize);
+	if(autocvar_g_ctf_flag_waypoint)
+	{
+		entity wp = WaypointSprite_SpawnFixed(basename, this.origin + FLAG_WAYPOINT_OFFSET, this, wps_flagbase, RADARICON_FLAG);
+		wp.colormod = ((this.team) ? Team_ColorRGB(this.team) : '1 1 1');
+		wp.fade_rate = autocvar_g_ctf_flag_waypoint_maxdistance;
+		WaypointSprite_UpdateTeamRadar(this.wps_flagbase, RADARICON_FLAG, ((this.team) ? colormapPaletteColor(this.team - 1, false) : '1 1 1'));
+		setcefc(wp, ctf_FlagBase_Customize);
+	}
 
 	// captureshield setup
 	ctf_CaptureShield_Spawn(this);
@@ -2173,7 +2206,7 @@ MUTATOR_HOOKFUNCTION(ctf, PlayerPreThink)
 		WaypointSprite_UpdateHealth(player.wps_flagcarrier, healtharmor_maxdamage(GetResource(player, RES_HEALTH), GetResource(player, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x);
 }
 
-MUTATOR_HOOKFUNCTION(ctf, Damage_Calculate) // for changing damage and force values that are applied to players in g_damage.qc
+MUTATOR_HOOKFUNCTION(ctf, Damage_Calculate) // for changing damage and force values that are applied to players in damage.qc
 {
 	entity frag_attacker = M_ARGV(1, entity);
 	entity frag_target = M_ARGV(2, entity);
@@ -2326,7 +2359,7 @@ MUTATOR_HOOKFUNCTION(ctf, PlayerUseKey)
 				if(head != player && SAME_TEAM(head, player))
 				if(!head.speedrunning && !head.vehicle)
 				{
-					// if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc)
+					// if it's a player, use the view origin as reference (stolen from RadiusDamage functions in damage.qc)
 					vector head_center = WarpZone_UnTransformOrigin(head, CENTER_OR_VIEWOFS(head));
 					vector passer_center = CENTER_OR_VIEWOFS(player);
 
@@ -2707,7 +2740,6 @@ spawnfunc(ctf_team)
 {
 	if(!g_ctf) { delete(this); return; }
 
-	this.classname = "ctf_team";
 	this.team = this.cnt + 1;
 }