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

Merge branch 'set-client-name'

Browse Source
This commit is contained in:
Nicholas Hastings 2015-04-17 04:50:13 -07:00
commit 2432540d6e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/sdktools/extension.cpp
View File

@ -50,7 +50,7 @@
*/ */
SH_DECL_HOOK6(IServerGameDLL, LevelInit, SH_NOATTRIB, false, bool, const char *, const char *, const char *, const char *, bool, bool); SH_DECL_HOOK6(IServerGameDLL, LevelInit, SH_NOATTRIB, false, bool, const char *, const char *, const char *, const char *, bool, bool);
#if SOURCE_ENGINE == SE_CSS #if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_CSGO
SH_DECL_HOOK1_void_vafmt(IVEngineServer, ClientCommand, SH_NOATTRIB, 0, edict_t *); SH_DECL_HOOK1_void_vafmt(IVEngineServer, ClientCommand, SH_NOATTRIB, 0, edict_t *);
#endif #endif
@ -264,7 +264,7 @@ bool SDKTools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool
#endif #endif
GET_V_IFACE_ANY(GetEngineFactory, soundemitterbase, ISoundEmitterSystemBase, SOUNDEMITTERSYSTEM_INTERFACE_VERSION); GET_V_IFACE_ANY(GetEngineFactory, soundemitterbase, ISoundEmitterSystemBase, SOUNDEMITTERSYSTEM_INTERFACE_VERSION);
#if SOURCE_ENGINE == SE_CSS #if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_CSGO
SH_ADD_HOOK(IVEngineServer, ClientCommand, engine, SH_MEMBER(this, &SDKTools::OnSendClientCommand), false); SH_ADD_HOOK(IVEngineServer, ClientCommand, engine, SH_MEMBER(this, &SDKTools::OnSendClientCommand), false);
#endif #endif
@ -277,7 +277,7 @@ bool SDKTools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool
bool SDKTools::SDK_OnMetamodUnload(char *error, size_t maxlen) bool SDKTools::SDK_OnMetamodUnload(char *error, size_t maxlen)
{ {
#if SOURCE_ENGINE == SE_CSS #if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_CSGO
SH_REMOVE_HOOK(IVEngineServer, ClientCommand, engine, SH_MEMBER(this, &SDKTools::OnSendClientCommand), false); SH_REMOVE_HOOK(IVEngineServer, ClientCommand, engine, SH_MEMBER(this, &SDKTools::OnSendClientCommand), false);
#endif #endif
return true; return true;
@ -471,12 +471,13 @@ void SDKTools::OnClientPutInServer(int client)
g_Hooks.OnClientPutInServer(client); g_Hooks.OnClientPutInServer(client);
} }
#if SOURCE_ENGINE == SE_CSS #if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_CSGO
void SDKTools::OnSendClientCommand(edict_t *pPlayer, const char *szFormat) void SDKTools::OnSendClientCommand(edict_t *pPlayer, const char *szFormat)
{ {
// Due to legacy code, CS:S still sends "name \"newname\"" to the client after a // Due to legacy code, CS:S and CS:GO still sends "name \"newname\"" to the
// name change. The engine has a change hook on name causing it to reset to the // client after aname change. The engine has a change hook on name causing
// player's Steam name. This quashes that to make SetClientName work properly. // it to reset to the player's Steam name. This quashes that to make
// SetClientName work properly.
if (!strncmp(szFormat, "name ", 5)) if (!strncmp(szFormat, "name ", 5))
{ {
RETURN_META(MRES_SUPERCEDE); RETURN_META(MRES_SUPERCEDE);

2
extensions/sdktools/extension.h
View File

@ -101,7 +101,7 @@ public: // IVoiceServer
#else #else
void OnClientCommand(edict_t *pEntity); void OnClientCommand(edict_t *pEntity);
#endif #endif
#if SOURCE_ENGINE == SE_CSS #if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_CSGO
void OnSendClientCommand(edict_t *pPlayer, const char *szFormat); void OnSendClientCommand(edict_t *pPlayer, const char *szFormat);
#endif #endif