From 86468f2c06a248e363999ad9902482fc3efac06f Mon Sep 17 00:00:00 2001 From: def Date: Thu, 9 Jan 2014 19:50:37 +0100 Subject: [PATCH] Emote fix --- src/game/server/entities/character.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index e9a9938a5..50c0ae6b6 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -922,8 +922,10 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon) GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_SHORT);*/ if (!m_Jetpack || m_ActiveWeapon != WEAPON_GUN) - m_EmoteType = EMOTE_PAIN; - m_EmoteStop = Server()->Tick() + 500 * Server()->TickSpeed() / 1000; + { + m_EmoteType = EMOTE_PAIN; + m_EmoteStop = Server()->Tick() + 500 * Server()->TickSpeed() / 1000; + } vec2 Temp = m_Core.m_Vel + Force; if(Temp.x > 0 && ((m_TileIndex == TILE_STOP && m_TileFlags == ROTATION_270) || (m_TileIndexL == TILE_STOP && m_TileFlagsL == ROTATION_270) || (m_TileIndexL == TILE_STOPS && (m_TileFlagsL == ROTATION_90 || m_TileFlagsL ==ROTATION_270)) || (m_TileIndexL == TILE_STOPA) || (m_TileFIndex == TILE_STOP && m_TileFFlags == ROTATION_270) || (m_TileFIndexL == TILE_STOP && m_TileFFlagsL == ROTATION_270) || (m_TileFIndexL == TILE_STOPS && (m_TileFFlagsL == ROTATION_90 || m_TileFFlagsL == ROTATION_270)) || (m_TileFIndexL == TILE_STOPA) || (m_TileSIndex == TILE_STOP && m_TileSFlags == ROTATION_270) || (m_TileSIndexL == TILE_STOP && m_TileSFlagsL == ROTATION_270) || (m_TileSIndexL == TILE_STOPS && (m_TileSFlagsL == ROTATION_90 || m_TileSFlagsL == ROTATION_270)) || (m_TileSIndexL == TILE_STOPA))) @@ -1015,8 +1017,7 @@ void CCharacter::Snap(int SnappingClient) } else if (m_Jetpack && m_ActiveWeapon == WEAPON_GUN) { - if (pCharacter->m_Emote == EMOTE_NORMAL) - pCharacter->m_Emote = EMOTE_HAPPY, + pCharacter->m_Emote = EMOTE_HAPPY, pCharacter->m_Weapon = WEAPON_NINJA; pCharacter->m_AmmoCount = 10; }