Add the cvars back for flagcarrier stuffz and fix some whitespace issues

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 34ebb314213a64716843b249b8e6024cd312940d..25936ffc5b2de2bf51453bbe2f11cabc359dfb3f 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -592,8 +592,10 @@ set gamecfg 1      // "deathmatch"
 // ctf
 set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
 set g_ctf_flag_returntime 15
-set g_ctf_flagcarrier_selfdamage 1
-set g_ctf_flagcarrier_selfforce 1
+set g_ctf_flagcarrier_selfdamagefactor 1
+set g_ctf_flagcarrier_selfforcefactor 1
+set g_ctf_flagcarrier_damagefactor 1
+set g_ctf_flagcarrier_forcefactor 1
 set g_ctf_fullbrightflags 0
 set g_ctf_dynamiclights 0
 set g_ctf_flag_damageforcescale 2

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index b4b1fe0e4b43e65209ff274d24168ed9c1de3236..7fe260df71ce44ebe7c601b9c26495334d501b4d 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -450,7 +450,7 @@ void ctf_Handle_Pickup_Dropped(entity flag, entity player)
        flag.ctf_status = FLAG_CARRY;
 
        // messages and sounds
-       Send_KillNotification (player.netname, flag.netname, "", INFO_PICKUPFLAG, MSG_INFO);
+       Send_KillNotification(player.netname, flag.netname, "", INFO_PICKUPFLAG, MSG_INFO);
        sound(player, CH_TRIGGER, flag.snd_flag_taken, VOL_BASE, ATTN_NONE);
        ctf_EventLog("pickup", flag.team, player);
        verbosename = ((autocvar_g_ctf_flag_pickup_verbosename) ? strcat(Team_ColorCode(player.team), "(^7", player.netname, Team_ColorCode(player.team), ") ") : "");
@@ -469,7 +469,7 @@ void ctf_Handle_Pickup_Dropped(entity flag, entity player)
        PlayerScore_Add(player, SP_CTF_PICKUPS, 1);
 
        // effects
-       if (autocvar_g_ctf_flag_pickup_effects) // field pickup effect
+       if(autocvar_g_ctf_flag_pickup_effects) // field pickup effect
        {
                pointparticles(particleeffectnum("smoke_ring"), 0.5 * (flag.absmin + flag.absmax), '0 0 0', 1); 
        }
@@ -817,7 +817,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerPreThink)
                self.items |= IT_CTF_SHIELDED;
 
        // scan through all the flags and notify the client about them 
-       for (flag = ctf_worldflaglist; flag; flag = flag.ctf_worldflagnext)
+       for(flag = ctf_worldflaglist; flag; flag = flag.ctf_worldflagnext)
        {
                if(flag.ctf_status == FLAG_CARRY)
                        if(flag.owner == self)