UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix mistaken unhooking of voice hooks (bug 4804, r=fyren)

Browse Source
This commit is contained in:
databomb 2011-03-08 12:17:21 -08:00
parent 9799970042
commit f2e19c0387
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
extensions/sdktools/voice.cpp
View File

@ -53,7 +53,6 @@ enum ListenOverride
size_t g_VoiceFlags[65]; size_t g_VoiceFlags[65];
size_t g_VoiceHookCount = 0; size_t g_VoiceHookCount = 0;
int g_ClientOverrides[65];
ListenOverride g_VoiceMap[65][65]; ListenOverride g_VoiceMap[65][65];
bool g_ClientMutes[65][65]; bool g_ClientMutes[65][65];
@ -65,11 +64,8 @@ SH_DECL_HOOK2_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, edict_t *,
SH_DECL_HOOK1_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, edict_t *); SH_DECL_HOOK1_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, edict_t *);
#endif #endif
bool DecHookCount(int amount = 1); bool DecHookCount()
bool DecHookCount(int amount)
{ {
g_VoiceHookCount -= amount;
assert(g_VoiceHookCount);
if (g_VoiceHookCount == 0) if (g_VoiceHookCount == 0)
{ {
SH_REMOVE_HOOK_MEMFUNC(IVoiceServer, SetClientListening, voiceserver, &g_SdkTools, &SDKTools::OnSetClientListening, false); SH_REMOVE_HOOK_MEMFUNC(IVoiceServer, SetClientListening, voiceserver, &g_SdkTools, &SDKTools::OnSetClientListening, false);
@ -90,7 +86,6 @@ void IncHookCount()
void SDKTools::VoiceInit() void SDKTools::VoiceInit()
{ {
memset(g_VoiceMap, 0, sizeof(g_VoiceMap)); memset(g_VoiceMap, 0, sizeof(g_VoiceMap));
memset(g_ClientOverrides, 0, sizeof(g_ClientOverrides));
memset(g_ClientMutes, 0, sizeof(g_ClientMutes)); memset(g_ClientMutes, 0, sizeof(g_ClientMutes));
SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &SDKTools::OnClientCommand, true); SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &SDKTools::OnClientCommand, true);
@ -123,7 +118,6 @@ void SDKTools::OnClientCommand(edict_t *pEntity)
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
bool SDKTools::OnSetClientListening(int iReceiver, int iSender, bool bListen) bool SDKTools::OnSetClientListening(int iReceiver, int iSender, bool bListen)
{ {
if (g_ClientMutes[iReceiver][iSender]) if (g_ClientMutes[iReceiver][iSender])
@ -194,6 +188,7 @@ void SDKTools::OnClientDisconnecting(int client)
} }
g_ClientMutes[i][client] = false; g_ClientMutes[i][client] = false;
g_ClientMutes[client][i] = false;
if (g_VoiceMap[i][client] != Listen_Default) if (g_VoiceMap[i][client] != Listen_Default)
{ {
@ -203,22 +198,19 @@ void SDKTools::OnClientDisconnecting(int client)
break; break;
} }
} }
} if (g_VoiceMap[client][i] != Listen_Default)
{
/* Reset this client's mutes */ g_VoiceMap[client][i] = Listen_Default;
memset(&g_ClientMutes[client], 0, sizeof(bool) * 65); if (DecHookCount())
{
/* Reset other clients who send to this client */ break;
if (g_ClientOverrides[client] > 0) }
{ }
DecHookCount(g_ClientOverrides[client]);
g_ClientOverrides[client] = 0;
memset(&g_VoiceMap[client], false, sizeof(ListenOverride) * 65);
} }
if (g_VoiceFlags[client]) if (g_VoiceFlags[client])
{ {
g_VoiceFlags[client] = 0; g_VoiceFlags[client] = SPEAK_NORMAL;
DecHookCount(); DecHookCount();
} }
} }
@ -295,13 +287,11 @@ static cell_t SetClientListening(IPluginContext *pContext, const cell_t *params)
if (g_VoiceMap[r][s] == Listen_Default && params[3] != Listen_Default) if (g_VoiceMap[r][s] == Listen_Default && params[3] != Listen_Default)
{ {
g_VoiceMap[r][s] = (ListenOverride) params[3]; g_VoiceMap[r][s] = (ListenOverride) params[3];
g_ClientOverrides[r]++;
IncHookCount(); IncHookCount();
} }
else if (g_VoiceMap[r][s] != Listen_Default && params[3] == Listen_Default) else if (g_VoiceMap[r][s] != Listen_Default && params[3] == Listen_Default)
{ {
g_VoiceMap[r][s] = (ListenOverride) params[3]; g_VoiceMap[r][s] = (ListenOverride) params[3];
g_ClientOverrides[r]--;
DecHookCount(); DecHookCount();
} }
else else