reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-01-28 22:48:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ignorerad command small optimization (#481)

Browse Source
This commit is contained in:
Dmitry 2019-12-25 19:36:26 +07:00 committed by Dmitry Novikov
parent 1f615d36b5
commit 7b0dab916d
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
regamedll/dlls/player.cpp
View File

@ -372,6 +372,10 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Radio)(const char *msg_id, const char *msg
if (!pPlayer) if (!pPlayer)
continue; continue;
// ignorerad command
if (pPlayer->m_bIgnoreRadio)
continue;
// are we a regular player? (not spectator) // are we a regular player? (not spectator)
if (pPlayer->IsPlayer()) if (pPlayer->IsPlayer())
{ {
@ -401,46 +405,43 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Radio)(const char *msg_id, const char *msg
if (bSend) if (bSend)
{ {
// ignorerad command MESSAGE_BEGIN(MSG_ONE, gmsgSendAudio, nullptr, pEntity->pev);
if (!pPlayer->m_bIgnoreRadio) WRITE_BYTE(ENTINDEX(edict()));
{ WRITE_STRING(msg_id);
MESSAGE_BEGIN(MSG_ONE, gmsgSendAudio, nullptr, pEntity->pev); WRITE_SHORT(pitch);
WRITE_BYTE(ENTINDEX(edict())); MESSAGE_END();
WRITE_STRING(msg_id);
WRITE_SHORT(pitch);
MESSAGE_END();
// radio message icon // radio message icon
if (msg_verbose) if (msg_verbose)
{
// search the place name where is located the player
const char *placeName = nullptr;
if (AreRunningCZero() && TheBotPhrases)
{ {
// search the place name where is located the player Place playerPlace = TheNavAreaGrid.GetPlace(&pev->origin);
const char *placeName = nullptr; const BotPhraseList *placeList = TheBotPhrases->GetPlaceList();
if (AreRunningCZero() && TheBotPhrases) for (auto phrase : *placeList)
{ {
Place playerPlace = TheNavAreaGrid.GetPlace(&pev->origin); if (phrase->GetID() == playerPlace)
const BotPhraseList *placeList = TheBotPhrases->GetPlaceList();
for (auto phrase : *placeList)
{ {
if (phrase->GetID() == playerPlace) placeName = phrase->GetName();
{ break;
placeName = phrase->GetName();
break;
}
} }
} }
if (placeName)
ClientPrint(pEntity->pev, HUD_PRINTRADIO, NumAsString(entindex()), "#Game_radio_location", STRING(pev->netname), placeName, msg_verbose);
else
ClientPrint(pEntity->pev, HUD_PRINTRADIO, NumAsString(entindex()), "#Game_radio", STRING(pev->netname), msg_verbose);
} }
if (placeName)
ClientPrint(pEntity->pev, HUD_PRINTRADIO, NumAsString(entindex()), "#Game_radio_location", STRING(pev->netname), placeName, msg_verbose);
else
ClientPrint(pEntity->pev, HUD_PRINTRADIO, NumAsString(entindex()), "#Game_radio", STRING(pev->netname), msg_verbose);
}
// icon over the head for teammates // icon over the head for teammates
#ifdef REGAMEDLL_ADD #ifdef REGAMEDLL_ADD
if (showIcon && show_radioicon.value) if (showIcon && show_radioicon.value)
#else #else
if (showIcon) if (showIcon)
#endif #endif
{ {
// put an icon over this guys head to show that he used the radio // put an icon over this guys head to show that he used the radio
MESSAGE_BEGIN(MSG_ONE, SVC_TEMPENTITY, nullptr, pEntity->pev); MESSAGE_BEGIN(MSG_ONE, SVC_TEMPENTITY, nullptr, pEntity->pev);
WRITE_BYTE(TE_PLAYERATTACHMENT); WRITE_BYTE(TE_PLAYERATTACHMENT);
@ -449,7 +450,6 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Radio)(const char *msg_id, const char *msg
WRITE_SHORT(g_sModelIndexRadio); // short (model index) of tempent WRITE_SHORT(g_sModelIndexRadio); // short (model index) of tempent
WRITE_SHORT(15); // short (life * 10 ) e.g. 40 = 4 seconds WRITE_SHORT(15); // short (life * 10 ) e.g. 40 = 4 seconds
MESSAGE_END(); MESSAGE_END();
}
} }
} }
} }