Merge pull request #35 from TomyLobo/fix-unstick

Fix da_auto_unstick
BSVino · Mar 30, 2016 · ab37427 · ab37427
2 parents 1150338 + a9c49b2
commit ab37427
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/mp/src/game/server/da/da_player.cpp b/mp/src/game/server/da/da_player.cpp
@@ -404,6 +404,8 @@ CDAPlayer::CDAPlayer()
 	m_flCurrentTime = gpGlobals->curtime;
 
 	m_iszCharacter = NULL_STRING;
+
+	m_flStuckTime = -1;
 }
 
 

diff --git a/mp/src/game/server/da/da_player.h b/mp/src/game/server/da/da_player.h
@@ -527,6 +527,7 @@ class CDAPlayer : public CBaseMultiplayerPlayer
 
 	int    m_iKills;
 	int    m_iDeaths;
+	float  m_flStuckTime;
 
 	CNetworkHandle(CDAPlayer, m_hKiller);
 	CNetworkHandle(CBaseEntity, m_hInflictor);

diff --git a/mp/src/game/shared/da/da_gamemovement.cpp b/mp/src/game/shared/da/da_gamemovement.cpp
@@ -127,15 +127,16 @@ class CDAGameMovement : public CGameMovement
 	bool ResolveStanding( void );
 	void TracePlayerBBoxWithStep( const Vector &vStart, const Vector &vEnd, unsigned int fMask, int collisionGroup, trace_t &trace );
 public:
+	// A reference to the player whose movement is currently being considered.
+	// If additional per-player data is needed, put it into CDAPlayer and refer to it via m_pDAPlayer.
+	// Do not put it directly into CDAGameMovement, because there isn't an instance of that per player.
 	CDAPlayer *m_pDAPlayer;
 
 #ifdef STUCK_DEBUG
 	float m_flStuckCheck;
 
 	void AddBotTag(const char* tag);
 #endif
-
-	float m_flStuckTime;
 };
 
 #define ROLL_TIME 0.65f
@@ -160,7 +161,6 @@ CDAGameMovement::CDAGameMovement()
 #ifdef STUCK_DEBUG
 	m_flStuckCheck = 0;
 #endif
-	m_flStuckTime = -1;
 }
 
 CDAGameMovement::~CDAGameMovement()
@@ -611,19 +611,19 @@ void CDAGameMovement::PlayerMove (void)
 #ifndef CLIENT_DLL
 	if (da_auto_unstick.GetBool() && m_pDAPlayer->IsAlive() && PlayerIsStuck() && m_pDAPlayer->GetMoveType() != MOVETYPE_NOCLIP)
 	{
-		if (m_flStuckTime < 0)
-			m_flStuckTime = gpGlobals->curtime;
-		else if (gpGlobals->curtime - m_flStuckTime > 3)
+		if (m_pDAPlayer->m_flStuckTime < 0)
+			m_pDAPlayer->m_flStuckTime = gpGlobals->curtime;
+		else if (gpGlobals->curtime - m_pDAPlayer->m_flStuckTime > 3)
 		{
 			// Im hopelessly stuck. Respawn me.
 			CBaseEntity* spawn = DAGameRules()->GetPlayerSpawnSpot(m_pDAPlayer);
 			mv->SetAbsOrigin(spawn->GetAbsOrigin());
 			mv->m_vecVelocity = Vector(0, 0, 0);
-			m_flStuckTime = -1;
+			m_pDAPlayer->m_flStuckTime = -1;
 		}
 	}
 	else
-		m_flStuckTime = -1;
+		m_pDAPlayer->m_flStuckTime = -1;
 #endif
 
 #ifdef STUCK_DEBUG
-Original file line number
+Diff line change
@@ Expand Up / @@ -404,6 +404,8 @@ CDAPlayer::CDAPlayer() @@
     	m_flCurrentTime = gpGlobals->curtime;
     	m_iszCharacter = NULL_STRING;
+    	m_flStuckTime = -1;
     }
@@ Expand Down @@