edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emote fix

Browse source
This commit is contained in:
def 2014-01-09 19:50:37 +01:00
parent 2a573d54ff
commit 86468f2c06
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/server/entities/character.cpp
View file

@ -922,8 +922,10 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_SHORT);*/ GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_SHORT);*/
if (!m_Jetpack || m_ActiveWeapon != WEAPON_GUN) 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; 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))) 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) 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_Weapon = WEAPON_NINJA;
pCharacter->m_AmmoCount = 10; pCharacter->m_AmmoCount = 10;
} }