Create separate FLAG_SCALE constant

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index f674a7ca9f349ff61f51f95b38a988ec2a529726..acb005b09d1159df69c6d89d6c3b137720ac8c7e 100644 (file)
--- 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 4feca2d09a4de9e2827c356f84ec4dbeae2c4110..9f8a65cccb0e774d59b438f78d7220d0411a6fc9 100644 (file)
--- 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;