diff options
| author | oy <Tom_Adams@web.de> | 2011-03-01 18:31:20 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-03-01 18:31:20 +0100 |
| commit | 4bede550be18cfc9bb4df669c147032917160066 (patch) | |
| tree | 56652609b0a47df5e1cf27abbbaf8a3d5cf9756d /src/game/server/entities | |
| parent | 0bc13c91ebcc6404fc67e079e5a9acad10176c98 (diff) | |
| download | zcatch-4bede550be18cfc9bb4df669c147032917160066.tar.gz zcatch-4bede550be18cfc9bb4df669c147032917160066.zip | |
only update the ping if the scoreboard is active. Closes #27
Diffstat (limited to 'src/game/server/entities')
| -rw-r--r-- | src/game/server/entities/character.cpp | 5 | ||||
| -rw-r--r-- | src/game/server/entities/character.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 1221d438..ddd416d1 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -54,7 +54,6 @@ void CCharacter::Reset() bool CCharacter::Spawn(CPlayer *pPlayer, vec2 Pos) { - m_PlayerState = PLAYERSTATE_UNKNOWN; m_EmoteStop = -1; m_LastAction = -1; m_ActiveWeapon = WEAPON_GUN; @@ -559,8 +558,6 @@ void CCharacter::Tick() // handle Weapons HandleWeapons(); - m_PlayerState = m_Input.m_PlayerState; - // Previnput m_PrevInput = m_Input; return; @@ -839,5 +836,5 @@ void CCharacter::Snap(int SnappingClient) pCharacter->m_Emote = EMOTE_BLINK; } - pCharacter->m_PlayerState = m_PlayerState; + pCharacter->m_PlayerFlags = GetPlayer()->m_PlayerFlags; } diff --git a/src/game/server/entities/character.h b/src/game/server/entities/character.h index 6346570f..b874fd0c 100644 --- a/src/game/server/entities/character.h +++ b/src/game/server/entities/character.h @@ -120,8 +120,6 @@ private: } m_Ninja; - int m_PlayerState;// if the client is chatting, accessing a menu or so - // the player core for the physics CCharacterCore m_Core; |