X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fctf%2Fsv_ctf.qc;h=937575752af4f2c1547f11ac55c39e0060314505;hb=0514f7948727cfa572b33bd29d1bdf2c13cd866d;hp=9f38cd9c36252dfe596b2a62e92fc849d2462682;hpb=73295fdedbff00283c27cd8d96c1074606374e0f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index 9f38cd9c36..937575752a 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>
@@ -534,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
@@ -601,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)
@@ -2192,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);
@@ -2345,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);
 
@@ -2726,7 +2740,6 @@ spawnfunc(ctf_team)
 {
 	if(!g_ctf) { delete(this); return; }
 
-	this.classname = "ctf_team";
 	this.team = this.cnt + 1;
 }