From c4d60e93ba2465a31777977551d0dc31648571c1 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sun, 22 Aug 2010 21:32:41 +0200 Subject: [PATCH] NOt needed as you can bind your own emote now Signed-off-by: GreYFoXGTi --- src/engine/server/server.cpp | 2 +- src/game/server/entities/character.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 2a86d34f6..9403baf90 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -884,7 +884,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket) m_aClients[ClientId].m_Addr.ip[1], m_aClients[ClientId].m_Addr.ip[2], m_aClients[ClientId].m_Addr.ip[3]); - BanAdd(m_aClients[ClientId].m_Addr, g_Config.m_SvRconTriesBantime,"Trying Rcon commands withou permission"); // bye + //BanAdd(m_aClients[ClientId].m_Addr, g_Config.m_SvRconTriesBantime,"Trying Rcon commands withou permission"); // bye } diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 15ccf1dd2..e09fb2382 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -1147,7 +1147,7 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon) GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_SHORT); */ // set attacker's face to happy (taunt!) - if(g_Config.m_SvEmotionalTees) + /*if(g_Config.m_SvEmotionalTees) { if (From >= 0 && From != m_pPlayer->GetCID() && GameServer()->m_apPlayers[From]) { @@ -1157,7 +1157,7 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon) pChr->m_EmoteType = EMOTE_HAPPY; pChr->m_EmoteStop = Server()->Tick() + Server()->TickSpeed(); } - } + }*///Removed you can set your emote via /emoteEMOTENAME //set the attacked face to pain m_EmoteType = EMOTE_PAIN; m_EmoteStop = Server()->Tick() + 500 * Server()->TickSpeed() / 1000;