Some fixes I forgot to self.deadflag in the vore code

[voretournament/voretournament.git] / data / qcsrc / server / cl_client.qc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 2cbfbd20cacd631dd601e203d4501a803ca3a56a..b096334c95a8e5a2cf30b1f4ae4a42cca3b52532 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -406,6 +406,7 @@ string CheckPlayerModel(string plyermodel) {
        {\r
                if(substring(plyermodel,-4,4) != ".zym")\r
                if(substring(plyermodel,-4,4) != ".dpm")\r
+               if(substring(plyermodel,-4,4) != ".iqm")\r
                if(substring(plyermodel,-4,4) != ".md3")\r
                if(substring(plyermodel,-4,4) != ".psk")\r
                        return FallbackPlayerModel;\r
@@ -526,6 +527,7 @@ float Client_customizeentityforclient()
        {\r
                applymodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
                Client_setmodel(applymodel);\r
+               self.frame = 0; // don't use any animations as a stomach\r
                self.alpha = other.cvar_cl_vore_stomachmodel;\r
                return TRUE;\r
        }\r
@@ -828,6 +830,8 @@ void PutClientInServer (void)
 \r
                RemoveGrabber(self); // Wazat's Grabber\r
 \r
+               Vore_DeadPrey_Detach(self);\r
+\r
                self.classname = "player";\r
                self.wasplayer = TRUE;\r
                self.iscreature = TRUE;\r
@@ -922,8 +926,6 @@ void PutClientInServer (void)
 \r
                SetCustomizer(self, Client_customizeentityforclient, Client_uncustomizeentityforclient);\r
 \r
-               Vore_DeadPrey_Detach(self);\r
-\r
                self.model = "";\r
                FixPlayermodel();\r
 \r
@@ -935,7 +937,7 @@ void PutClientInServer (void)
                // don't reset back to last position, even if new position is stuck in solid\r
                self.oldorigin = self.origin;\r
                self.prevorigin = self.origin;\r
-               self.lastrocket = world; // stop rocket guiding, no revenge from the grave!\r
+               self.lastteleporttime = time; // prevent insane speeds due to changing origin\r
 \r
                if(g_arena)\r
                {\r
@@ -992,8 +994,16 @@ void PutClientInServer (void)
 \r
                // reset fields the weapons may use\r
         for (j = WEP_FIRST; j <= WEP_LAST; ++j)\r
+               {\r
             weapon_action(j, WR_RESETPLAYER);\r
 \r
+                       // all weapons must be fully loaded when we spawn\r
+                       entity e;\r
+                       e = get_weaponinfo(j);\r
+                       if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars\r
+                               self.weapon_load[j] = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));\r
+               }\r
+\r
                oldself = self;\r
                self = spot;\r
                        activator = oldself;\r
@@ -1924,8 +1934,8 @@ void player_regen (void)
 \r
        if (!g_ca && (!g_lms || cvar("g_lms_regenerate")))\r
        {\r
-               self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregenarmor_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita, "misc/armor_regen.ogg");\r
-               self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith, "misc/health_regen.ogg");\r
+               self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregenarmor_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita, "misc/armor_regen.wav");\r
+               self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith, "misc/health_regen.wav");\r
 \r
                // if player rotted to death...  die!\r
                if(self.health < 1)\r
@@ -2021,6 +2031,8 @@ void SpectateCopy(entity spectatee) {
        self.armortype = spectatee.armortype;\r
        self.armorvalue = spectatee.armorvalue;\r
        self.ammo_fuel = spectatee.ammo_fuel;\r
+       self.clip_load = spectatee.clip_load;\r
+       self.clip_size = spectatee.clip_size;\r
        self.effects = spectatee.effects & EFMASK_CHEAP; // eat performance\r
        self.health = spectatee.health;\r
        self.impulse = 0;\r
@@ -2046,6 +2058,7 @@ void SpectateCopy(entity spectatee) {
        self.stat_stomachload = spectatee.stat_stomachload;\r
        self.stat_digesting = spectatee.stat_digesting;\r
        self.stat_canleave = spectatee.stat_canleave;\r
+       self.stat_canswallow = spectatee.stat_canswallow;\r
        setorigin(self, spectatee.origin);\r
        setsize(self, spectatee.mins, spectatee.maxs);\r
        SetZoomState(spectatee.zoomstate);\r
@@ -2651,11 +2664,14 @@ void PlayerPreThink (void)
                }\r
 \r
                self.taunt_soundtime = 0;\r
-               self.taunt_soundtimefiltered = FALSE;\r
                self.taunt_soundtype = 0;\r
        }\r
 \r
        target_voicescript_next(self);\r
+\r
+       // if a player goes unarmed after holding a loaded weapon, empty his clip size and remove the crosshair ammo ring\r
+       if(!self.weapon)\r
+               self.clip_load = self.clip_size = 0;\r
 }\r
 \r
 float isInvisibleString(string s)\r
@@ -2668,9 +2684,16 @@ float isInvisibleString(string s)
                switch(c)\r
                {\r
                        case 0:\r
-                       case 32:\r
-                       case 160:\r
+                       case 32: // space\r
                                break;\r
+                       case 192: // charmap space\r
+                               if (!cvar("utf8_enable"))\r
+                                       break;\r
+                               return FALSE;\r
+                       case 160: // space in unicode fonts\r
+                       case 0xE000 + 192: // utf8 charmap space\r
+                               if (cvar("utf8_enable"))\r
+                                       break;\r
                        default:\r
                                return FALSE;\r
                }\r