diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-02-18 16:24:08 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-02-18 16:24:08 +0100 |
| commit | 4c582edf1d7669369da7f785bb8cfbb7267fb9b0 (patch) | |
| tree | 7b21020979d7842d2de21ef5e806ae179d5abaf2 /src/game | |
| parent | 6188a315289913b70e81fd1f5969171f507094f1 (diff) | |
| download | zcatch-4c582edf1d7669369da7f785bb8cfbb7267fb9b0.tar.gz zcatch-4c582edf1d7669369da7f785bb8cfbb7267fb9b0.zip | |
better automelt display
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/server/entities/character.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index f64a16e3..60b1d0f9 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -595,7 +595,6 @@ void CCharacter::Tick() if(Server()->Tick() % Server()->TickSpeed() == 0) { GameServer()->CreateDamageInd(m_Pos, 0, m_FreezeTicks/Server()->TickSpeed()+1); - m_Armor = m_FreezeTicks/Server()->TickSpeed(); GameServer()->CreateSound(m_Pos, SOUND_WEAPON_NOAMMO); } //Set weapon back to the last one @@ -921,8 +920,8 @@ void CCharacter::Snap(int SnappingClient) if(m_pPlayer->GetCID() == SnappingClient || SnappingClient == -1 || (!g_Config.m_SvStrictSpectateMode && m_pPlayer->GetCID() == GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID)) { - pCharacter->m_Health = m_Health; - pCharacter->m_Armor = m_Armor; + pCharacter->m_Health = (m_FreezeTicks) ? (m_FreezeTicks/Server()->TickSpeed())/10 : m_Health; + pCharacter->m_Armor = (m_FreezeTicks) ? (m_FreezeTicks/Server()->TickSpeed()) % 10 +1 : m_Armor; if(m_aWeapons[m_ActiveWeapon].m_Ammo > 0) pCharacter->m_AmmoCount = m_aWeapons[m_ActiveWeapon].m_Ammo; } |