diff options
| author | nsinreal <nsinreal@gmail.com> | 2011-06-26 14:17:56 +0300 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-06-27 16:28:49 +0200 |
| commit | 66a8000620a79498b286505236f17db555e6e74d (patch) | |
| tree | d4423d36b0e4771d1d43d11e264281db2a041504 | |
| parent | fb309436b4794743c86886fddf39bfae315fdc1a (diff) | |
| download | zcatch-66a8000620a79498b286505236f17db555e6e74d.tar.gz zcatch-66a8000620a79498b286505236f17db555e6e74d.zip | |
Fixed ninja: always set last active weapon after ninja's end
| -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 c89e24d0..9e2033b2 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -120,8 +120,6 @@ void CCharacter::HandleNinja() // time's up, return m_aWeapons[WEAPON_NINJA].m_Got = false; m_ActiveWeapon = m_LastWeapon; - if(m_ActiveWeapon == WEAPON_NINJA) - m_ActiveWeapon = WEAPON_GUN; SetWeapon(m_ActiveWeapon); return; @@ -486,7 +484,8 @@ void CCharacter::GiveNinja() m_Ninja.m_ActivationTick = Server()->Tick(); m_aWeapons[WEAPON_NINJA].m_Got = true; m_aWeapons[WEAPON_NINJA].m_Ammo = -1; - m_LastWeapon = m_ActiveWeapon; + if (m_ActiveWeapon != WEAPON_NINJA) + m_LastWeapon = m_ActiveWeapon; m_ActiveWeapon = WEAPON_NINJA; GameServer()->CreateSound(m_Pos, SOUND_PICKUP_NINJA); |