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

Patch for ifvers 5:11 (new MM API), eliminates fakemeta like mm-pext

Browse Source
This commit is contained in:
David Anderson 2005-07-13 02:37:32 +00:00
parent e1a1153018
commit 35ed810775
4 changed files with 83 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
amxmodx/amxmodx.h
View File

@ -137,6 +137,7 @@ struct fakecmd_t {
bool fake; bool fake;
}; };
extern bool g_IsNewMM;
extern pextension_funcs_t *gpMetaPExtFuncs; extern pextension_funcs_t *gpMetaPExtFuncs;
extern CLog g_log; extern CLog g_log;
extern CPluginMngr g_plugins; extern CPluginMngr g_plugins;

1
amxmodx/amxxlog.cpp
View File

@ -92,7 +92,6 @@ void CLog::CreateNewFile()
int i = 0; int i = 0;
while (true) while (true)
{ {
char file[256];
FILE *pTmpFile = fopen(m_LogFile.c_str(), "r"); // open for reading to check whether the file exists FILE *pTmpFile = fopen(m_LogFile.c_str(), "r"); // open for reading to check whether the file exists
if (!pTmpFile) if (!pTmpFile)
break; break;

61
amxmodx/fakemeta.cpp
View File

@ -2355,7 +2355,7 @@ void FakeMeta_New_CVarRegister(cvar_t *pCVar)
int CFakeMeta::CFakeMetaPlugin::Query(mutil_funcs_t *pMetaUtilFuncs) int CFakeMeta::CFakeMetaPlugin::Query(mutil_funcs_t *pMetaUtilFuncs)
{ {
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) if(gpMetaPExtFuncs || g_IsNewMM)
{ {
//load plugins in meta_attach //load plugins in meta_attach
m_Status = PL_OPENED; m_Status = PL_OPENED;
@ -2429,8 +2429,22 @@ int CFakeMeta::CFakeMetaPlugin::Attach(PLUG_LOADTIME now, meta_globals_t *pMGlob
{ {
// evilspy's patch: // evilspy's patch:
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) { if (gpMetaPExtFuncs)
if(PEXT_LOAD_PLUGIN_BY_NAME(PLID, m_Path.c_str(), now, (void**)&m_Handle) || !m_Handle) { {
if(PEXT_LOAD_PLUGIN_BY_NAME(PLID, m_Path.c_str(), now, (void**)&m_Handle) || !m_Handle)
{
LOG_MESSAGE(PLID, "Can't Attach Module \"%s\".", m_Path.c_str());
m_Status = PL_FAILED;
return 0;
}
m_Status = PL_RUNNING;
return 1;
} else if (g_IsNewMM) {
int err = 0;
if ( (err = LOAD_PLUGIN(PLID, m_Path.c_str(), now, (void **)&m_Handle)) || !m_Handle)
{
LOG_MESSAGE(PLID, "Can't Attach Module \"%s\".", m_Path.c_str());
m_Status = PL_FAILED; m_Status = PL_FAILED;
return 0; return 0;
} }
@ -2441,6 +2455,7 @@ int CFakeMeta::CFakeMetaPlugin::Attach(PLUG_LOADTIME now, meta_globals_t *pMGlob
if (!m_Handle) if (!m_Handle)
return 0; return 0;
META_ATTACH_FN attachFn = (META_ATTACH_FN)DLSYM(m_Handle, "Meta_Attach"); META_ATTACH_FN attachFn = (META_ATTACH_FN)DLSYM(m_Handle, "Meta_Attach");
if (!attachFn) if (!attachFn)
{ {
@ -2450,7 +2465,7 @@ int CFakeMeta::CFakeMetaPlugin::Attach(PLUG_LOADTIME now, meta_globals_t *pMGlob
} }
if (attachFn(now, &m_MetaFuncTable, pMGlobals, pGameDllFuncs) != 1) if (attachFn(now, &m_MetaFuncTable, pMGlobals, pGameDllFuncs) != 1)
{ {
AMXXLOG_Log("[AMXX] Can't Attach Module \"%s\" (\"%s\").", m_Info->name, m_Path.c_str()); LOG_MESSAGE(PLID, "Can't Attach Module \"%s\".", m_Path.c_str());
m_Status = PL_FAILED; m_Status = PL_FAILED;
return 0; return 0;
} }
@ -2466,7 +2481,8 @@ int CFakeMeta::CFakeMetaPlugin::Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reaso
// evilspy's patch: // evilspy's patch:
//using metamod p-extensions? //using metamod p-extensions?
if (gpMetaPExtFuncs) { if (gpMetaPExtFuncs)
{
if(PEXT_UNLOAD_PLUGIN_BY_HANDLE(PLID, (void*)m_Handle, now, reason)) { if(PEXT_UNLOAD_PLUGIN_BY_HANDLE(PLID, (void*)m_Handle, now, reason)) {
m_Status = PL_FAILED; m_Status = PL_FAILED;
return 0; return 0;
@ -2474,6 +2490,15 @@ int CFakeMeta::CFakeMetaPlugin::Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reaso
m_Status = PL_OPENED; m_Status = PL_OPENED;
m_Handle = NULL; m_Handle = NULL;
return 1; return 1;
} else if (g_IsNewMM) {
if (UNLOAD_PLUGIN_BY_HANDLE(PLID, (void *)m_Handle, now, reason))
{
m_Status = PL_FAILED;
return 0;
}
m_Status = PL_OPENED;
m_Handle = NULL;
return 1;
} }
META_DETACH_FN detachFn = (META_DETACH_FN)DLSYM(m_Handle, "Meta_Detach"); META_DETACH_FN detachFn = (META_DETACH_FN)DLSYM(m_Handle, "Meta_Detach");
@ -2568,7 +2593,7 @@ bool CFakeMeta::AddCorePlugin()
{ {
// evilspy: // evilspy:
// not needed when using metamod p-extensions // not needed when using metamod p-extensions
if(gpMetaPExtFuncs) if(gpMetaPExtFuncs || g_IsNewMM)
return true; return true;
// Check whether there already is a core plugin // Check whether there already is a core plugin
@ -2595,7 +2620,7 @@ void CFakeMeta::Meta_Query(mutil_funcs_t *pMetaUtilFuncs)
// evilspy: // evilspy:
// using metamod p-extensions? // using metamod p-extensions?
if(!gpMetaPExtFuncs) if(!gpMetaPExtFuncs && !g_IsNewMM)
++iter; // Skip core ++iter; // Skip core
for (; iter; ++iter) for (; iter; ++iter)
@ -2613,7 +2638,7 @@ void CFakeMeta::Meta_Attach(PLUG_LOADTIME now, meta_globals_t *pMGlobals, gamedl
CList<CFakeMetaPlugin>::iterator iter = m_Plugins.begin(); CList<CFakeMetaPlugin>::iterator iter = m_Plugins.begin();
// evilspy: // evilspy:
// using metamod p-extensions? // using metamod p-extensions?
if(!gpMetaPExtFuncs) if(!gpMetaPExtFuncs && !g_IsNewMM)
++iter; // Skip core ++iter; // Skip core
for (; iter; ++iter) for (; iter; ++iter)
@ -2629,7 +2654,7 @@ void CFakeMeta::Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
CList<CFakeMetaPlugin>::iterator iter = m_Plugins.begin(); CList<CFakeMetaPlugin>::iterator iter = m_Plugins.begin();
// evilspy: // evilspy:
// using metamod p-extensions? // using metamod p-extensions?
if(!gpMetaPExtFuncs) if(!gpMetaPExtFuncs && !g_IsNewMM)
++iter; // Skip core ++iter; // Skip core
for (; iter; ++iter) for (; iter; ++iter)
@ -2650,7 +2675,8 @@ int CFakeMeta::GetEntityAPI2(DLL_FUNCTIONS *pFunctionTable /*from metamod*/, int
// evilspy: // evilspy:
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) { if(gpMetaPExtFuncs || g_IsNewMM)
{
memcpy( pFunctionTable, pAMXXFunctionTable, sizeof( DLL_FUNCTIONS ) ); memcpy( pFunctionTable, pAMXXFunctionTable, sizeof( DLL_FUNCTIONS ) );
return TRUE; return TRUE;
} }
@ -2687,7 +2713,8 @@ int CFakeMeta::GetEntityAPI2_Post(DLL_FUNCTIONS *pFunctionTable /*from metamod*/
// evilspy // evilspy
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) { if(gpMetaPExtFuncs || g_IsNewMM)
{
memcpy( pFunctionTable, pAMXXFunctionTable, sizeof( DLL_FUNCTIONS ) ); memcpy( pFunctionTable, pAMXXFunctionTable, sizeof( DLL_FUNCTIONS ) );
return TRUE; return TRUE;
} }
@ -2724,7 +2751,8 @@ int CFakeMeta::GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inter
// evilspy: // evilspy:
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) { if(gpMetaPExtFuncs || g_IsNewMM)
{
memcpy( pengfuncsFromEngine, pAMXXFunctionTable, sizeof( enginefuncs_t ) ); memcpy( pengfuncsFromEngine, pAMXXFunctionTable, sizeof( enginefuncs_t ) );
return TRUE; return TRUE;
} }
@ -2760,7 +2788,8 @@ int CFakeMeta::GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine, int *
// evilspy: // evilspy:
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) { if(gpMetaPExtFuncs || g_IsNewMM)
{
memcpy( pengfuncsFromEngine, pAMXXFunctionTable, sizeof( enginefuncs_t ) ); memcpy( pengfuncsFromEngine, pAMXXFunctionTable, sizeof( enginefuncs_t ) );
return TRUE; return TRUE;
} }
@ -2803,7 +2832,8 @@ int CFakeMeta::GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable, int *int
// evilspy: // evilspy:
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) { if(gpMetaPExtFuncs || g_IsNewMM)
{
memcpy( pNewFunctionTable, pAMXXFunctionTable, sizeof( NEW_DLL_FUNCTIONS ) ); memcpy( pNewFunctionTable, pAMXXFunctionTable, sizeof( NEW_DLL_FUNCTIONS ) );
return TRUE; return TRUE;
} }
@ -2846,7 +2876,8 @@ int CFakeMeta::GetNewDLLFunctions_Post(NEW_DLL_FUNCTIONS *pNewFunctionTable, int
// evilspy: // evilspy:
//using metamod p-extensions? //using metamod p-extensions?
if(gpMetaPExtFuncs) { if(gpMetaPExtFuncs || g_IsNewMM)
{
memcpy( pNewFunctionTable, pAMXXFunctionTable, sizeof( NEW_DLL_FUNCTIONS ) ); memcpy( pNewFunctionTable, pAMXXFunctionTable, sizeof( NEW_DLL_FUNCTIONS ) );
return TRUE; return TRUE;
} }

48
amxmodx/meta_api.cpp
View File

@ -89,6 +89,7 @@ float g_game_timeleft;
float g_task_time; float g_task_time;
float g_auth_time; float g_auth_time;
bool g_initialized = false; bool g_initialized = false;
bool g_IsNewMM = false;
#ifdef MEMORY_TEST #ifdef MEMORY_TEST
float g_next_memreport_time; float g_next_memreport_time;
@ -1025,27 +1026,45 @@ void C_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...)
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_t *pMetaUtilFuncs) { C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_t *pMetaUtilFuncs)
{
gpMetaUtilFuncs=pMetaUtilFuncs; gpMetaUtilFuncs=pMetaUtilFuncs;
*pPlugInfo=&Plugin_info; *pPlugInfo=&Plugin_info;
if(strcmp(ifvers, Plugin_info.ifvers)) { if(strcmp(ifvers, Plugin_info.ifvers))
{
int mmajor=0, mminor=0, pmajor=0, pminor=0; int mmajor=0, mminor=0, pmajor=0, pminor=0;
LOG_MESSAGE(PLID, "WARNING: meta-interface version mismatch; requested=%s ours=%s", Plugin_info.logtag, ifvers); LOG_MESSAGE(PLID, "WARNING: meta-interface version mismatch; requested=%s ours=%s", Plugin_info.logtag, ifvers);
sscanf(ifvers, "%d:%d", &mmajor, &mminor); sscanf(ifvers, "%d:%d", &mmajor, &mminor);
sscanf(META_INTERFACE_VERSION, "%d:%d", &pmajor, &pminor); sscanf(META_INTERFACE_VERSION, "%d:%d", &pmajor, &pminor);
if(pmajor > mmajor || (pmajor==mmajor && pminor > mminor)) { if(pmajor > mmajor)
{
LOG_ERROR(PLID, "metamod version is too old for this plugin; update metamod"); LOG_ERROR(PLID, "metamod version is too old for this plugin; update metamod");
return(FALSE); return(FALSE);
} } else if(pmajor < mmajor) {
else if(pmajor < mmajor) {
LOG_ERROR(PLID, "metamod version is incompatible with this plugin; please find a newer version of this plugin"); LOG_ERROR(PLID, "metamod version is incompatible with this plugin; please find a newer version of this plugin");
return(FALSE); return(FALSE);
} } else if (pmajor==mmajor) {
else if(pmajor==mmajor && pminor < mminor) if (mminor == 10)
{
LOG_MESSAGE(PLID, "WARNING: metamod version is older than expected; consider finding a newer version");
g_IsNewMM = false;
//hack!
Plugin_info.ifvers = "5:10";
} else if (mminor == 11) {
g_IsNewMM = true;
} else if (pminor > mminor) {
LOG_ERROR(PLID, "metamod version is incompatible with this plugin; please find a newer version of this plugin");
return FALSE;
} else if (pminor < mminor) {
LOG_MESSAGE(PLID, "WARNING: metamod version is newer than expected; consider finding a newer version of this plugin"); LOG_MESSAGE(PLID, "WARNING: metamod version is newer than expected; consider finding a newer version of this plugin");
else }
LOG_MESSAGE(PLID, "WARNING: metamod version is newer than expected; consider finding a newer version of this plugin");
} else {
LOG_ERROR(PLID, "unexpected version comparison; metavers=%s, mmajor=%d, mminor=%d; plugvers=%s, pmajor=%d, pminor=%d", ifvers, mmajor, mminor, META_INTERFACE_VERSION, pmajor, pminor); LOG_ERROR(PLID, "unexpected version comparison; metavers=%s, mmajor=%d, mminor=%d; plugvers=%s, pmajor=%d, pminor=%d", ifvers, mmajor, mminor, META_INTERFACE_VERSION, pmajor, pminor);
} }
} else {
g_IsNewMM = true;
}
// We can set this to null here because Meta_PExtGiveFnptrs is called after this // We can set this to null here because Meta_PExtGiveFnptrs is called after this
gpMetaPExtFuncs = NULL; gpMetaPExtFuncs = NULL;
@ -1056,8 +1075,10 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_
// evilspy's patch for mm-p ext support // evilspy's patch for mm-p ext support
// this is called right after Meta_Query // this is called right after Meta_Query
C_DLLEXPORT int Meta_PExtGiveFnptrs(int interfaceVersion, pextension_funcs_t *pMetaPExtFuncs) { C_DLLEXPORT int Meta_PExtGiveFnptrs(int interfaceVersion, pextension_funcs_t *pMetaPExtFuncs)
if(interfaceVersion<META_PEXT_VERSION) { {
if(interfaceVersion<META_PEXT_VERSION)
{
return(META_PEXT_VERSION); return(META_PEXT_VERSION);
} }
gpMetaPExtFuncs = pMetaPExtFuncs; gpMetaPExtFuncs = pMetaPExtFuncs;
@ -1065,11 +1086,14 @@ C_DLLEXPORT int Meta_PExtGiveFnptrs(int interfaceVersion, pextension_funcs_t *pM
} }
static META_FUNCTIONS gMetaFunctionTable; static META_FUNCTIONS gMetaFunctionTable;
C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs) { C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs)
if(now > Plugin_info.loadable) { {
if(now > Plugin_info.loadable)
{
LOG_ERROR(PLID, "Can't load plugin right now"); LOG_ERROR(PLID, "Can't load plugin right now");
return(FALSE); return(FALSE);
} }
LOG_MESSAGE(PLID, "gpMetaPExtFuncs=%p, g_IsNewMM=%d", gpMetaPExtFuncs, g_IsNewMM);
gpMetaGlobals=pMGlobals; gpMetaGlobals=pMGlobals;
gMetaFunctionTable.pfnGetEntityAPI2 = GetEntityAPI2; gMetaFunctionTable.pfnGetEntityAPI2 = GetEntityAPI2;
gMetaFunctionTable.pfnGetEntityAPI2_Post = GetEntityAPI2_Post; gMetaFunctionTable.pfnGetEntityAPI2_Post = GetEntityAPI2_Post;