a number of fixes.

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b5958a8ab2511eea80fd76d1d741f9c2a3939551..898be9eed3755278952c47b31fc131e563eb3028 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -606,8 +606,9 @@ set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze team
 seta g_freezetag_warmup 5 "Time players get to run around before the round starts"
 seta g_freezetag_point_limit -1        "Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_freezetag_point_leadlimit -1    "Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
-seta g_freezetag_revive_time 5 "Time it takes to revive a frozen teammate"
+seta g_freezetag_revive_time 3 "Time it takes to revive a frozen teammate"
 seta g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
+seta g_freezetag_frozen_force 0.25 "How much to multiply the force on a frozen player with"
 
 // 50% of the spawns shall be far away from any players
 set g_spawn_furthest 0.5

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 2fad0959774bf2345cd3fb722ad3a902aaf952de..85d4b7191237def269f5c45d9f9c3d9a73eb7916 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -96,6 +96,11 @@ void reset_map(float dorespawn)
                                self.classname = "player";
                                PutClientInServer();
                        }
+                       else if(g_freezetag)
+                       {
+                               if(self.classname == "player")
+                                       PutClientInServer();
+                       }
                        else
                        {
                                /*
@@ -196,7 +201,7 @@ void Arena_Warmup()
        float f;
        string msg;
 
-       if((!g_arena && !g_ca) || (g_arena && !arena_roundbased) || (time < game_starttime))
+       if((!g_arena && !g_ca && !g_freezetag) || (g_arena && !arena_roundbased) || (time < game_starttime))
                return;
 
        f = ceil(warmup - time);

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index a2943a76053e61e6e873e951594bfa7bd1898feb..8d4bdf6663d8a8f9085cadd88117bcb74f5e3645 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -595,12 +595,16 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                        }
                }
 
-               // become fully visible
-               self.alpha = 1;
-               // clear selected player display
-               ClearSelectedPlayer();
-               // throw a weapon
-               SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);
+               if(!g_freezetag)
+               {
+                       // become fully visible
+                       self.alpha = 1;
+                       // clear selected player display
+                       ClearSelectedPlayer();
+                       // throw a weapon
+                       SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);
+               }
+
                // print an obituary message
                Obituary (attacker, inflictor, self, deathtype);
                race_PreDie();
@@ -611,6 +615,9 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                frag_target = self;
                MUTATOR_CALLHOOK(PlayerDies);
 
+               if(g_freezetag)
+                       return;
+
                if(self.flagcarried)
                {
                        if(attacker.classname != "player" && attacker.classname != "gib")

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 45af9a9d57f4a7e862064b3a88bd9f68c8b82220..5b765396c4641aa847b5aacd2c20f3dc395d726f 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -313,6 +313,9 @@ void W_WeaponFrame()
        if(((arena_roundbased || g_ca || g_freezetag) && time < warmup) || ((time < game_starttime) && !cvar("sv_ready_restart_after_countdown")))
                return;
 
+       if(g_freezetag && self.freezetag_frozen == 1)
+               return;
+
        if (!self.weaponentity || self.health < 1)
                return; // Dead player can't use weapons and injure impulse commands
 

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 460c608dcf357d944829978620b3e21247f61724..1a4ce7106753a10ab3b91c39e7762c75f6dc887a 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -526,6 +526,15 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                if (attacker.isbot)
                        damage = damage * bound(0.1, (skill + 5) * 0.1, 1);
 
+               if(g_freezetag)
+               {
+                       if(targ.freezetag_frozen == 1)
+                       {
+                               damage = 0;
+                               force = force * cvar("g_freezetag_frozen_force");
+                       }
+               }
+
                // nullify damage if teamplay is on
                if(deathtype != DEATH_TELEFRAG)
                if(attacker.classname == "player")

diff --git a/scripts/ice.shader b/scripts/ice.shader
index 368dcb86807f0c0ffd1e5173f64a50856a5bcb3a..edac84d1c5a0ae08d3eb875f8dfb692887bdced7 100644 (file)
--- a/scripts/ice.shader
+++ b/scripts/ice.shader
@@ -1,4 +1,4 @@
-models/ice/ice.tga
+models/ice/ice
 {
        cull none
        dpnoshadow
@@ -8,4 +8,4 @@ models/ice/ice.tga
        blendfunc add
        rgbgen vertex
  }
-}
\ No newline at end of file
+}