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

Better ICons + Mac Icons

Browse source 
Disabled Emotional tees until reworked
This commit is contained in:
GreYFoX 2011-04-13 00:34:57 +02:00
parent e3cc1c405e
commit dd70b687ed
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
other/icons/DDRace.icns Normal file
View file

Binary file not shown.

BIN
other/icons/DDRace.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 151 KiB

BIN
other/icons/DDRace_srv.icns Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 113 KiB

7
src/game/server/gamecontext.cpp
View file

@ -1203,9 +1203,8 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
pPlayer->m_LastEmote = Server()->Tick();
SendEmoticon(ClientID, pMsg->m_Emoticon);
SendEmoticon(ClientID, pMsg->m_Emoticon);
CCharacter* pChr = pPlayer->GetCharacter();
// TODO:DDRace GreYFoX Rework Emoticons
/*CCharacter* pChr = pPlayer->GetCharacter();
if(pChr && g_Config.m_SvEmotionalTees && pChr->m_EyeEmote)
{
switch(pMsg->m_Emoticon)
@ -1237,7 +1236,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
break;
}
pChr->SetEmoteStop(Server()->Tick() + 2 * Server()->TickSpeed());
}
}*/
}
else if (MsgID == NETMSGTYPE_CL_KILL && !m_World.m_Paused)
{