Player size now influences a player's weight as well, alongside stomach load. Macros...

[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 1edb3c189680ee706be9bdcfcea0833ac5c9506c..dcc68204f2ce0c76a1b983973f489ed587808521 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -534,15 +534,27 @@ float Client_customizeentityforclient()
        if(other.predator == self)\r
        {\r
                Client_setmodel(stomachmodel);\r
+               self.angles_x = self.angles_z = 0; // don't apply player leaning to stomach models\r
                self.effects |= EF_NODEPTHTEST; // don't hide behind walls\r
                self.alpha = other.cvar_cl_vore_stomachmodel;\r
                return TRUE;\r
        }\r
 \r
        Client_setmodel(setmodel_state());\r
-       self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_nodepthtestplayers"))\r
+               self.effects |= EF_NODEPTHTEST;\r
+       else\r
+               self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_fullbrightplayers"))\r
+               self.effects |= EF_FULLBRIGHT;\r
+\r
        if not(self.stat_eaten)\r
+       {\r
                self.alpha = default_player_alpha;\r
+               if(cvar("g_vore_swallowfade"))\r
+               if not(other == self && !chase)\r
+                       self.alpha *= 1 - self.swallow_progress_prey; // fade players out as they are swallowed, to better simulate their disappearing\r
+       }\r
        else if(cvar("g_vore_neighborprey_distance") && self.predator == other.predator && !(chase || other.classname == "observer"))\r
        {\r
                self.alpha = default_player_alpha; // allow seeing neighboring prey\r
@@ -579,7 +591,7 @@ void PutObserverInServer (void)
                WriteEntity(MSG_ONE, self);\r
        }\r
 \r
-       Vore_Disconnect();\r
+       Vore_Disconnect(TRUE);\r
 \r
        kh_Key_DropAll(self, TRUE);\r
 \r
@@ -615,7 +627,7 @@ void PutObserverInServer (void)
        self.health = -666;\r
        self.takedamage = DAMAGE_NO;\r
        self.solid = SOLID_NOT;\r
-       self.movetype = MOVETYPE_NOCLIP;\r
+       self.movetype = MOVETYPE_FLY_WORLDONLY; // user preference is controlled by playerprethink\r
        self.flags = FL_CLIENT | FL_NOTARGET;\r
        self.armorvalue = 666;\r
        self.effects = 0;\r
@@ -644,9 +656,9 @@ void PutObserverInServer (void)
        self.fixangle = TRUE;\r
        self.crouch = FALSE;\r
 \r
-       self.view_ofs = PL_VIEW_OFS;\r
+       self.view_ofs = '0 0 0'; // so that your view doesn't go into the ceiling with MOVETYPE_FLY_WORLDONLY, previously "PL_VIEW_OFS"\r
        setorigin (self, spot.origin);\r
-       setsize (self, '0 0 0', '0 0 0');\r
+       setsize (self, PL_CROUCH_MIN, PL_CROUCH_MAX); // give the spectator some space between walls for MOVETYPE_FLY_WORLDONLY\r
        self.prevorigin = self.origin;\r
        self.items = 0;\r
        self.weapons = 0;\r
@@ -802,6 +814,8 @@ Called when a client spawns in the server
 //void() ctf_playerchanged;\r
 void PutClientInServer (void)\r
 {\r
+       entity e;\r
+\r
        if(clienttype(self) == CLIENTTYPE_BOT)\r
        {\r
                self.classname = "player";\r
@@ -846,7 +860,7 @@ void PutClientInServer (void)
 \r
                RemoveGrabber(self); // Wazat's Grabber\r
 \r
-               Vore_Disconnect();\r
+               Vore_Disconnect(TRUE);\r
                self.swallow_progress_pred = self.swallow_progress_prey = 0;\r
 \r
                self.classname = "player";\r
@@ -1017,7 +1031,6 @@ void PutClientInServer (void)
             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
@@ -1373,6 +1386,7 @@ void FixClientCvars(entity e)
        stuffcmd(e, strcat("cl_movement_maxairspeed ", ftos(cvar("sv_maxairspeed")), "\n"));\r
        stuffcmd(e, strcat("cl_movement_stopspeed ", ftos(cvar("sv_stopspeed")), "\n"));\r
        stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("sv_jumpvelocity")), "\n"));\r
+       stuffcmd(e, strcat("cl_movement_crouchvelocity ", ftos(cvar("sv_crouchvelocity")), "\n"));\r
        stuffcmd(e, strcat("cl_movement_stepheight ", ftos(cvar("sv_stepheight")), "\n"));\r
        stuffcmd(e, strcat("set cl_movement_friction_on_land ", ftos(cvar("sv_friction_on_land")), "\n"));\r
        stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(cvar("sv_airaccel_qw")), "\n"));\r
@@ -1617,7 +1631,7 @@ void ClientDisconnect (void)
                return;\r
        }\r
 \r
-       Vore_Disconnect();\r
+       Vore_Disconnect(TRUE);\r
 \r
        CheatShutdownClient();\r
 \r
@@ -1888,12 +1902,6 @@ void player_powerups (void)
                }\r
        }\r
 \r
-       if(cvar("g_nodepthtestplayers"))\r
-               self.effects = self.effects | EF_NODEPTHTEST;\r
-\r
-       if(cvar("g_fullbrightplayers"))\r
-               self.effects = self.effects | EF_FULLBRIGHT;\r
-\r
        // midair gamemode: damage only while in the air\r
        // if in midair mode, being on ground grants temporary invulnerability\r
        // (this is so that multishot weapon don't clear the ground flag on the\r
@@ -1953,7 +1961,7 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re
                                {\r
                                        msg_entity = self;\r
                                        if(clienttype(msg_entity) == CLIENTTYPE_REAL)\r
-                                               soundto(MSG_ONE, self, CHAN_AUTO, regensound, VOL_BASE, ATTN_NONE);\r
+                                               soundto(MSG_ONE, self, CHAN_AUTO, regensound, VOL_BASE, ATTN_NONE, 0);\r
                                }\r
                                self.regen_soundtime = time + 1; // only replay the sound if regen was paused for one second\r
                        }\r
@@ -2121,7 +2129,7 @@ void SpectateCopy(entity spectatee) {
        self.swallow_progress_prey = spectatee.swallow_progress_prey;\r
        self.swallow_progress_pred = spectatee.swallow_progress_pred;\r
        self.stat_stomachload = spectatee.stat_stomachload;\r
-       self.stat_stomachmaxload = spectatee.stomach_maxload;\r
+       self.stat_stomachmaxload = spectatee.stat_stomachmaxload;\r
        self.stat_digesting = spectatee.stat_digesting;\r
        self.stat_canleave = spectatee.stat_canleave;\r
        self.stat_canswallow = spectatee.stat_canswallow;\r
@@ -2133,6 +2141,9 @@ void SpectateCopy(entity spectatee) {
        setsize(self, spectatee.mins, spectatee.maxs);\r
        SetZoomState(spectatee.zoomstate);\r
 \r
+       // copy necessary flags\r
+       if(spectatee.flags & FL_ONGROUND)       self.flags |= FL_ONGROUND;      else    self.flags &~= FL_ONGROUND;\r
+\r
        anticheat_spectatecopy(spectatee);\r
 }\r
 \r
@@ -2345,7 +2356,7 @@ void SetPlayerSize()
                {\r
                        //setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);\r
                        if(!self.stat_eaten)\r
-                               self.view_ofs = PL_VIEW_OFS * self.scale;\r
+                               self.view_ofs = PL_VIEW_OFS * pow(self.scale, cvar("g_healthsize_viewfactor"));\r
                }\r
 \r
                self.last_alive_scale = self.scale;\r
@@ -2368,17 +2379,20 @@ void SetPlayerSize()
 \r
 void ObserverThink()\r
 {\r
+       float prefered_movetype;\r
        if (self.flags & FL_JUMPRELEASED) {\r
                if (self.BUTTON_JUMP && !self.version_mismatch) {\r
-                       self.welcomemessage_time = 0;\r
                        self.flags &~= FL_JUMPRELEASED;\r
                        self.flags |= FL_SPAWNING;\r
                } else if(self.BUTTON_ATCK && !self.version_mismatch) {\r
-                       self.welcomemessage_time = 0;\r
                        self.flags &~= FL_JUMPRELEASED;\r
                        if(SpectateNext() == 1) {\r
                                self.classname = "spectator";\r
                        }\r
+               } else {\r
+                       prefered_movetype = ((!self.BUTTON_USE ? self.cvar_cl_clippedspectating : !self.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP);\r
+                       if (self.movetype != prefered_movetype)\r
+                               self.movetype = prefered_movetype;\r
                }\r
        } else {\r
                if (!(self.BUTTON_ATCK || self.BUTTON_JUMP)) {\r
@@ -2391,6 +2405,7 @@ void ObserverThink()
                        }\r
                }\r
        }\r
+\r
        PrintWelcomeMessage(self);\r
 }\r
 \r
@@ -2591,7 +2606,7 @@ void PlayerPreThink (void)
                        accel_y = bound(-cvar("g_leanplayer_acceleration_max"), accel_y, cvar("g_leanplayer_acceleration_max"));\r
                        accel_z = bound(-cvar("g_leanplayer_acceleration_max"), accel_z, cvar("g_leanplayer_acceleration_max"));\r
 \r
-                       L0_x = vlen(accel);\r
+                       L0_x = vlen(accel) * -1;\r
                        L0_y = L1_y = vectoyaw(accel);\r
 \r
                        L0 = AnglesTransform_FromAngles(L0);\r