Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix player not being internally disconnected in some situation + add client_disconnected forward

Browse Source
This commit is contained in:
Arkshine
2015-07-17 00:26:30 +02:00
parent a9015d1d84
commit ed4faf7c11
21 changed files with 158 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
amxmodx/CGameConfigs.cpp
View File

@ -13,6 +13,7 @@
CGameConfigManager ConfigManager;
static CGameMasterReader MasterReader;
IGameConfig *CommonConfig;
//
// GAME CONFIG
@ -886,6 +887,17 @@ CGameConfigManager::~CGameConfigManager()
{
}
void CGameConfigManager::OnAmxxStartup()
{
char error[256] = "";
if (!LoadGameConfigFile("common.games", &CommonConfig, error, sizeof(error)))
{
AMXXLOG_Log("Could not read common.games gamedata: %s", error);
return;
}
}
bool CGameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **config, char *error, size_t maxlength)
{
CGameConfig *configFromCache;

2
amxmodx/CGameConfigs.h
View File

@ -152,6 +152,7 @@ class CGameConfigManager : public IGameConfigManager
public:
void OnAmxxStartup();
void RemoveCachedConfig(CGameConfig *config);
private:
@ -164,5 +165,6 @@ class CGameConfigManager : public IGameConfigManager
};
extern CGameConfigManager ConfigManager;
extern IGameConfig *CommonConfig;
#endif // _INCLUDE_GAMECONFIG_H_

2
amxmodx/CMisc.cpp
View File

@ -20,6 +20,7 @@ void CPlayer::Init(edict_t* e, int i)
initialized = false;
ingame = false;
authorized = false;
disconnecting = false;
teamIdsInitialized = false;
current = 0;
@ -42,6 +43,7 @@ void CPlayer::Disconnect()
ingame = false;
initialized = false;
authorized = false;
disconnecting = false;
teamIdsInitialized = false;
if (Menu *pMenu = get_menu_by_id(newmenu))

1
amxmodx/CMisc.h
View File

@ -37,6 +37,7 @@ public:
bool initialized;
bool ingame;
bool authorized;
bool disconnecting;
bool vgui;
bool teamIdsInitialized;

76
amxmodx/meta_api.cpp
View File

@ -28,6 +28,9 @@
#include "CLibrarySys.h"
#include "CFileSystem.h"
#include "gameconfigs.h"
#include "CGameConfigs.h"
#include <engine_strucs.h>
#include <CDetour/detours.h>
plugin_info_t Plugin_info =
{
@ -112,6 +115,8 @@ int mPlayerIndex;
int mState;
int g_srvindex;
CDetour *DropClientDetour;
cvar_t init_amxmodx_version = {"amxmodx_version", "", FCVAR_SERVER | FCVAR_SPONLY};
cvar_t init_amxmodx_modules = {"amxmodx_modules", "", FCVAR_SPONLY};
cvar_t init_amxmodx_debug = {"amx_debug", "1", FCVAR_SPONLY};
@ -128,6 +133,7 @@ cvar_t* mp_timelimit = NULL;
int FF_ClientCommand = -1;
int FF_ClientConnect = -1;
int FF_ClientDisconnect = -1;
int FF_ClientDisconnected = -1;
int FF_ClientInfoChanged = -1;
int FF_ClientPutInServer = -1;
int FF_PluginInit = -1;
@ -487,6 +493,7 @@ int C_Spawn(edict_t *pent)
FF_ClientCommand = registerForward("client_command", ET_STOP, FP_CELL, FP_DONE);
FF_ClientConnect = registerForward("client_connect", ET_IGNORE, FP_CELL, FP_DONE);
FF_ClientDisconnect = registerForward("client_disconnect", ET_IGNORE, FP_CELL, FP_DONE);
FF_ClientDisconnected = registerForward("client_disconnected", ET_IGNORE, FP_CELL, FP_CELL, FP_ARRAY, FP_CELL, FP_DONE);
FF_ClientInfoChanged = registerForward("client_infochanged", ET_IGNORE, FP_CELL, FP_DONE);
FF_ClientPutInServer = registerForward("client_putinserver", ET_IGNORE, FP_CELL, FP_DONE);
FF_PluginCfg = registerForward("plugin_cfg", ET_IGNORE, FP_DONE);
@ -648,9 +655,18 @@ void C_ServerDeactivate()
for (int i = 1; i <= gpGlobals->maxClients; ++i)
{
CPlayer *pPlayer = GET_PLAYER_POINTER_I(i);
if (pPlayer->initialized)
{
// deprecated
executeForwards(FF_ClientDisconnect, static_cast<cell>(pPlayer->index));
if (DropClientDetour && !pPlayer->disconnecting)
{
executeForwards(FF_ClientDisconnected, static_cast<cell>(pPlayer->index), FALSE, prepareCharArray(const_cast<char*>(""), 0), 0);
}
}
if (pPlayer->ingame)
{
pPlayer->Disconnect();
@ -811,18 +827,59 @@ BOOL C_ClientConnect_Post(edict_t *pEntity, const char *pszName, const char *psz
void C_ClientDisconnect(edict_t *pEntity)
{
CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
if (pPlayer->initialized)
{
// deprecated
executeForwards(FF_ClientDisconnect, static_cast<cell>(pPlayer->index));
if (DropClientDetour && !pPlayer->disconnecting)
{
executeForwards(FF_ClientDisconnected, static_cast<cell>(pPlayer->index), FALSE, prepareCharArray(const_cast<char*>(""), 0), 0);
}
}
if (pPlayer->ingame)
{
--g_players_num;
}
pPlayer->Disconnect();
RETURN_META(MRES_IGNORED);
}
// void SV_DropClient(client_t *cl, qboolean crash, const char *fmt, ...);
DETOUR_DECL_STATIC3_VAR(SV_DropClient, void, client_t*, cl, qboolean, crash, const char*, format)
{
char buffer[1024];
va_list ap;
va_start(ap, format);
ke::SafeVsnprintf(buffer, sizeof(buffer) - 1, format, ap);
va_end(ap);
CPlayer *pPlayer;
if (cl->edict)
{
pPlayer = GET_PLAYER_POINTER(cl->edict);
if (pPlayer->initialized)
{
pPlayer->disconnecting = true;
executeForwards(FF_ClientDisconnected, pPlayer->index, TRUE, prepareCharArray(buffer, sizeof(buffer), true), sizeof(buffer) - 1);
}
}
DETOUR_STATIC_CALL(SV_DropClient)(cl, crash, "%s", buffer);
if (cl->edict)
{
pPlayer->Disconnect();
}
}
void C_ClientPutInServer_Post(edict_t *pEntity)
{
CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
@ -1489,6 +1546,20 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
g_CvarManager.CreateCvarHook();
ConfigManager.OnAmxxStartup();
void *address = nullptr;
if (CommonConfig && CommonConfig->GetMemSig("SV_DropClient", &address))
{
DropClientDetour = DETOUR_CREATE_STATIC_FIXED(SV_DropClient, address);
DropClientDetour->EnableDetour();
}
else
{
AMXXLOG_Log("client_disconnected forward has been disabled - check your gamedata files.");
}
GET_IFACE<IFileSystem>("filesystem_stdio", g_FileSystem, FILESYSTEM_INTERFACE_VERSION);
return (TRUE);
@ -1534,6 +1605,11 @@ C_DLLEXPORT int Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
ClearLibraries(LibSource_Plugin);
ClearLibraries(LibSource_Module);
if (DropClientDetour)
{
DropClientDetour->Destroy();
}
return (TRUE);
}