X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics%2Fplayer.qc;h=a8a32998e48f8f01cc6c45f7dad82024e92ffe4d;hb=83f8515d11629bf338ac97ca0385c420fff5a8da;hp=09882c02da2b74fbb63cf77bccf366ede1cc213d;hpb=dcb6fbf52a99ff9ab1f99482d4b0a57bacb7afa4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 09882c02d..a8a32998e 100644
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -85,7 +85,7 @@ float GeomLerp(float a, float _lerp, float b)
 {
 	return a == 0 ? (_lerp < 1 ? 0 : b)
 		: b == 0 ? (_lerp > 0 ? 0 : a)
-		: a * pow(fabs(b / a), _lerp);
+		: a * (fabs(b / a) ** _lerp);
 }
 
 void PM_ClientMovement_UpdateStatus(entity this)
@@ -96,8 +96,15 @@ void PM_ClientMovement_UpdateStatus(entity this)
 
 	// set crouched
 	bool do_crouch = PHYS_INPUT_BUTTON_CROUCH(this);
-	if(this.hook && !wasfreed(this.hook))
-		do_crouch = false;
+	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		entity wep = viewmodels[slot];
+		if(wep.hook && !wasfreed(wep.hook))
+		{
+			do_crouch = false;
+			break; // don't bother checking the others
+		}
+	}
 	if(this.waterlevel >= WATERLEVEL_SWIMMING)
 		do_crouch = false;
 	if(hud != HUD_NORMAL)
@@ -115,7 +122,7 @@ void PM_ClientMovement_UpdateStatus(entity this)
 		// wants to stand, if currently crouching we need to check for a low ceiling first
 		if (IS_DUCKED(this))
 		{
-			tracebox(this.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), this.origin, MOVE_NORMAL, this);
+			tracebox(this.origin, STAT(PL_MIN, this), STAT(PL_MAX, this), this.origin, MOVE_NORMAL, this);
 			if (!trace_startsolid) UNSET_DUCKED(this);
 		}
 	}
@@ -146,7 +153,7 @@ void CPM_PM_Aircontrol(entity this, float dt, vector wishdir, float wishspeed)
 
 	if (dot > 0) // we can't change direction while slowing down
 	{
-		k *= pow(dot, PHYS_AIRCONTROL_POWER(this)) * dt;
+		k *= (dot ** PHYS_AIRCONTROL_POWER(this)) * dt;
 		xyspeed = max(0, xyspeed - PHYS_AIRCONTROL_PENALTY(this) * sqrt(max(0, 1 - dot*dot)) * k/32);
 		k *= PHYS_AIRCONTROL(this);
 		this.velocity = normalize(this.velocity * xyspeed + wishdir * k);
@@ -285,6 +292,7 @@ bool PlayerJump(entity this)
 
 	bool doublejump = false;
 	float mjumpheight = PHYS_JUMPVELOCITY(this);
+	bool track_jump = PHYS_CL_TRACK_CANJUMP(this);
 
 	if (MUTATOR_CALLHOOK(PlayerJump, this, mjumpheight, doublejump))
 		return true;
@@ -298,6 +306,7 @@ bool PlayerJump(entity this)
 		{
 			doublejump = true;
 			mjumpheight *= 0.7;
+			track_jump = true;
 		}
 		else
 		{
@@ -307,10 +316,9 @@ bool PlayerJump(entity this)
 	}
 
 	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);
 	if(PHYS_TRACK_CANJUMP(this))
 		track_jump = true;
 
@@ -344,7 +352,7 @@ bool PlayerJump(entity this)
 		}
 	}
 
-	if (!WAS_ONGROUND(this))
+	if (!WAS_ONGROUND(this) && !WAS_ONSLICK(this))
 	{
 #ifdef SVQC
 		if(autocvar_speedmeter)
@@ -366,6 +374,7 @@ bool PlayerJump(entity this)
 	this.velocity_z += mjumpheight;
 
 	UNSET_ONGROUND(this);
+	UNSET_ONSLICK(this);
 	SET_JUMP_HELD(this);
 
 #ifdef SVQC
@@ -480,15 +489,15 @@ float racecar_angle(float forward, float down)
 		return ret * angle_mult;
 }
 
+#ifdef SVQC
 string specialcommand = "xwxwxsxsxaxdxaxdx1x ";
 .float specialcommand_pos;
 void SpecialCommand(entity this)
 {
-#ifdef SVQC
 	if (!CheatImpulse(this, CHIMPULSE_GIVE_ALL.impulse))
 		LOG_INFO("A hollow voice says \"Plugh\".\n");
-#endif
 }
+#endif
 
 bool PM_check_specialcommand(entity this, int buttons)
 {
@@ -607,7 +616,12 @@ void PM_check_hitground(entity this)
     this.wasFlying = false;
     if (this.waterlevel >= WATERLEVEL_SWIMMING) return;
     if (time < this.ladder_time) return;
-    if (this.hook) return;
+    for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+    {
+    	.entity weaponentity = weaponentities[slot];
+    	if(this.(weaponentity).hook)
+    		return;
+    }
     this.nextstep = time + 0.3 + random() * 0.1;
     trace_dphitq3surfaceflags = 0;
     tracebox(this.origin, this.mins, this.maxs, this.origin - '0 0 1', MOVE_NOMONSTERS, this);
@@ -641,6 +655,24 @@ void PM_Footsteps(entity this)
 #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
@@ -651,8 +683,6 @@ void PM_check_blocked(entity this)
 #endif
 }
 
-.vector oldmovement;
-
 void PM_jetpack(entity this, float maxspd_mod, float dt)
 {
 	//makevectors(this.v_angle.y * '0 1 0');
@@ -786,5 +816,10 @@ void CSQC_ClientMovement_PlayerMove_Frame(entity this)
 
 #ifdef SVQC
 	this.pm_frametime = frametime;
+#elif defined(CSQC)
+	if((ITEMS_STAT(this) & IT_USING_JETPACK) && !IS_DEAD(this) && !intermission)
+		this.csqcmodel_modelflags |= MF_ROCKET;
+	else
+		this.csqcmodel_modelflags &= ~MF_ROCKET;
 #endif
 }