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

CPlayer: Rename EyeEmote to EyeEmoteEnabled (to be clear)

Browse source
This commit is contained in:
Alexander Akulich 2021-01-12 22:11:42 +03:00
parent 2286771349
commit 5a9af45f9a
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/server/ddracechat.cpp
View file

@ -1061,21 +1061,21 @@ void CGameContext::ConSetEyeEmote(IConsole::IResult *pResult,
pSelf->Console()->Print(
IConsole::OUTPUT_LEVEL_STANDARD,
"emote",
(pPlayer->m_EyeEmote) ?
(pPlayer->m_EyeEmoteEnabled) ?
"You can now use the preset eye emotes." :
"You don't have any eye emotes, remember to bind some. (until you die)");
return;
}
else if(str_comp_nocase(pResult->GetString(0), "on") == 0)
pPlayer->m_EyeEmote = true;
pPlayer->m_EyeEmoteEnabled = true;
else if(str_comp_nocase(pResult->GetString(0), "off") == 0)
pPlayer->m_EyeEmote = false;
pPlayer->m_EyeEmoteEnabled = false;
else if(str_comp_nocase(pResult->GetString(0), "toggle") == 0)
pPlayer->m_EyeEmote = !pPlayer->m_EyeEmote;
pPlayer->m_EyeEmoteEnabled = !pPlayer->m_EyeEmoteEnabled;
pSelf->Console()->Print(
IConsole::OUTPUT_LEVEL_STANDARD,
"emote",
(pPlayer->m_EyeEmote) ?
(pPlayer->m_EyeEmoteEnabled) ?
"You can now use the preset eye emotes." :
"You don't have any eye emotes, remember to bind some. (until you die)");
}

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

@ -2290,7 +2290,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
SendEmoticon(ClientID, pMsg->m_Emoticon);
CCharacter *pChr = pPlayer->GetCharacter();
if(pChr && g_Config.m_SvEmotionalTees && pPlayer->m_EyeEmote)
if(pChr && g_Config.m_SvEmotionalTees && pPlayer->m_EyeEmoteEnabled)
{
int EmoteType = EMOTE_NORMAL;
switch(pMsg->m_Emoticon)

2
src/game/server/player.cpp
View file

@ -61,7 +61,7 @@ void CPlayer::Reset()
m_Sent2ndAfkWarning = 0;
m_ChatScore = 0;
m_Moderating = false;
m_EyeEmote = true;
m_EyeEmoteEnabled = true;
if(Server()->IsSixup(m_ClientID))
m_TimerType = TIMERTYPE_SIXUP;
else

2
src/game/server/player.h
View file

@ -190,7 +190,7 @@ public:
int m_Sent1stAfkWarning; // afk timer's 1st warning after 50% of sv_max_afk_time
int m_Sent2ndAfkWarning; // afk timer's 2nd warning after 90% of sv_max_afk_time
char m_pAfkMsg[160];
bool m_EyeEmote;
bool m_EyeEmoteEnabled;
int m_TimerType;
int m_DefEmote;
int m_DefEmoteReset;