edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 18:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOt needed as you can bind your own emote now

Browse source 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-22 21:32:41 +02:00
parent 999e8590e7
commit c4d60e93ba
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/server/server.cpp
View file

@ -884,7 +884,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
m_aClients[ClientId].m_Addr.ip[1], m_aClients[ClientId].m_Addr.ip[1],
m_aClients[ClientId].m_Addr.ip[2], m_aClients[ClientId].m_Addr.ip[2],
m_aClients[ClientId].m_Addr.ip[3]); 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
} }

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

@ -1147,7 +1147,7 @@ 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);
*/ */
// set attacker's face to happy (taunt!) // 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]) 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_EmoteType = EMOTE_HAPPY;
pChr->m_EmoteStop = Server()->Tick() + Server()->TickSpeed(); pChr->m_EmoteStop = Server()->Tick() + Server()->TickSpeed();
} }
} }*///Removed you can set your emote via /emoteEMOTENAME
//set the attacked face to pain //set the attacked face to pain
m_EmoteType = EMOTE_PAIN; m_EmoteType = EMOTE_PAIN;
m_EmoteStop = Server()->Tick() + 500 * Server()->TickSpeed() / 1000; m_EmoteStop = Server()->Tick() + 500 * Server()->TickSpeed() / 1000;