Merge branch 'master' into Mario/wepent_experimental

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics / player.qc

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index f407be711134657178e65f1c957c808dd5358542..fd57e974ac8c242773500ec2edfd835655528adc 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -314,7 +314,7 @@ bool PlayerJump(entity this)
        }
 
        if (!doublejump)
        }
 
        if (!doublejump)

-               if (!IS_ONGROUND(this))
+               if (!IS_ONGROUND(this) && !IS_ONSLICK(this))

                        return IS_JUMP_HELD(this);
 
        bool track_jump = PHYS_CL_TRACK_CANJUMP(this);
                        return IS_JUMP_HELD(this);
 
        bool track_jump = PHYS_CL_TRACK_CANJUMP(this);


@@ -351,7 +351,7 @@ bool PlayerJump(entity this)
                }
        }
 
                }
        }
 

-       if (!WAS_ONGROUND(this))
+       if (!WAS_ONGROUND(this) && !WAS_ONSLICK(this))

        {
 #ifdef SVQC
                if(autocvar_speedmeter)
        {
 #ifdef SVQC
                if(autocvar_speedmeter)


@@ -373,6 +373,7 @@ bool PlayerJump(entity this)
        this.velocity_z += mjumpheight;
 
        UNSET_ONGROUND(this);
        this.velocity_z += mjumpheight;
 
        UNSET_ONGROUND(this);

+       UNSET_ONSLICK(this);

        SET_JUMP_HELD(this);
 
 #ifdef SVQC
        SET_JUMP_HELD(this);
 
 #ifdef SVQC


@@ -653,6 +654,24 @@ void PM_Footsteps(entity this)
 #endif
 }
 
 #endif
 }
 

+void PM_check_slick(entity this)
+{
+       if(!IS_ONGROUND(this))
+               return;
+
+       if(!PHYS_SLICK_APPLYGRAVITY(this))
+               return;
+
+       tracebox(this.origin, this.mins, this.maxs, this.origin - '0 0 1', MOVE_NOMONSTERS, this);
+       if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK)
+       {
+               UNSET_ONGROUND(this);
+               SET_ONSLICK(this);
+       }
+       else
+               UNSET_ONSLICK(this);
+}
+

 void PM_check_blocked(entity this)
 {
 #ifdef SVQC
 void PM_check_blocked(entity this)
 {
 #ifdef SVQC