From: Samual <samual@xonotic.org>
Date: Fri, 30 Mar 2012 03:36:31 +0000 (-0400)
Subject: Create separate FLAG_SCALE constant
X-Git-Tag: xonotic-v0.7.0~240^2~161
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5c52d22cfa5b462874ba5c9de7f5f5617e4277d0;p=xonotic%2Fxonotic-data.pk3dir.git

Create separate FLAG_SCALE constant
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index f674a7ca9..acb005b09 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -559,7 +559,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
 	setmodel(flag, flag.model); // precision set below
 	setsize(flag, FLAG_MIN, FLAG_MAX);
 	setorigin(flag, (flag.origin + FLAG_SPAWN_OFFSET));
-	if(!flag.scale) { flag.scale = 0.6; } // FIXME: why hard coded 0.6?
+	if(!flag.scale) { flag.scale = FLAG_SCALE; }
 	
 	flag.skin = ((teamnumber) ? autocvar_g_ctf_flag_red_skin : autocvar_g_ctf_flag_blue_skin);
 	
@@ -616,8 +616,6 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
 // Hook Functions
 // ==============
 
-// g_ctf_ignore_frags
-
 MUTATOR_HOOKFUNCTION(ctf_RemovePlayer)
 {
 	if(self.flagcarried) { ctf_Handle_Drop(self); }
diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index 4feca2d09..9f8a65ccc 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -18,6 +18,7 @@ void spawnfunc_ctf_team();
 #define FLAG_CARRY_OFFSET ('-15 0 7')
 #define FLAG_SPAWN_OFFSET ('0 0 1' * (PL_MAX_z - 13))
 #define FLAG_WAYPOINT_OFFSET ('0 0 64')
+#define FLAG_SCALE 0.6
 
 // list of flags on the map
 entity ctf_worldflaglist;