Cubemap reflections for all fluid types, for much better water slime and lava

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

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 5f3ebe4cd125b7ebae94a6a800af79873a5ae820..e595c69abec6f924c39d6dedb37d66256c342f0a 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -507,14 +507,19 @@ void PM_Accelerate(vector wishdir, float wishspeed, float wishspeed0, float acce
        if(speedclamp)\r
                accelqw = -accelqw;\r
 \r
-       if(cvar("g_balance_vore_load_pred_weight") > 0) // apply stomach weight\r
-               wishspeed /= 1 + (self.stomach_load / self.stomach_maxload) * cvar("g_balance_vore_load_pred_speed");\r
-       if(cvar("g_healthsize")) // if we are smaller or larger, we run slower or faster\r
-               wishspeed *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; \r
-       if(self.swallow_progress_prey) // cut speed based on swallow progress for prey\r
-               wishspeed *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd_prey"));\r
-       if(self.swallow_progress_pred) // cut speed based on swallow progress for preds\r
-               wishspeed *= 1 - (self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_cutspd_pred"));\r
+       if(self.classname == "player")\r
+       {\r
+               if(cvar("g_balance_vore_load_pred_weight") > 0) // apply stomach weight\r
+                       wishspeed /= 1 + (self.stomach_load / self.stomach_maxload) * cvar("g_balance_vore_load_pred_speed");\r
+               if(cvar("g_healthsize")) // if we are smaller or larger, we run slower or faster\r
+                       wishspeed *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; \r
+               if(self.swallow_progress_prey) // cut speed based on swallow progress for prey\r
+                       wishspeed *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd_prey"));\r
+               if(self.swallow_progress_pred) // cut speed based on swallow progress for preds\r
+                       wishspeed *= 1 - (self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_cutspd_pred"));\r
+               if(self.grabber_stunned > time && random() <= cvar("g_balance_grabber_secondary_stun_rate")) // randomly cut speed while the player is stunned\r
+                       return;\r
+       }\r
 \r
        if(cvar("sv_gameplayfix_q2airaccelerate"))\r
                wishspeed0 = wishspeed;\r
@@ -851,6 +856,7 @@ void SV_PlayerPhysics()
        {\r
                self.wasFlying = 0;\r
 \r
+               if(self.classname == "player")\r
                if(self.waterlevel < WATERLEVEL_SWIMMING)\r
                if(time >= self.ladder_time)\r
                if not(self.grabber)\r
@@ -911,7 +917,7 @@ void SV_PlayerPhysics()
        {\r
                RaceCarPhysics();\r
        }\r
-       else if (self.movetype == MOVETYPE_NOCLIP || self.movetype == MOVETYPE_FLY)\r
+       else if (self.movetype == MOVETYPE_NOCLIP || self.movetype == MOVETYPE_FLY || self.movetype == MOVETYPE_FLY_WORLDONLY)\r
        {\r
                // noclipping or flying\r
                self.flags &~= FL_ONGROUND;\r
@@ -1150,7 +1156,7 @@ void SV_PlayerPhysics()
                if (wishspeed > sv_maxspeed*maxspd_mod)\r
                        wishspeed = sv_maxspeed*maxspd_mod;\r
                if (self.crouch)\r
-                       wishspeed = wishspeed * 0.5;\r
+                       wishspeed = wishspeed * cvar("sv_crouchvelocity");\r
                if (time >= self.teleport_time)\r
                        PM_Accelerate(wishdir, wishspeed, wishspeed, sv_accelerate*maxspd_mod, 1, 0);\r
        }\r
@@ -1182,7 +1188,7 @@ void SV_PlayerPhysics()
                if (wishspeed > maxairspd)\r
                        wishspeed = maxairspd;\r
                if (self.crouch)\r
-                       wishspeed = wishspeed * 0.5;\r
+                       wishspeed = wishspeed * cvar("sv_crouchvelocity");\r
                if (time >= self.teleport_time)\r
                {\r
                        float accelerating;\r