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

cvar queries actually run now

Browse Source 
removed old fakemeta code
This commit is contained in:
David Anderson 2006-02-03 04:19:18 +00:00
parent 07affb56f2
commit 88d2b393d8
2 changed files with 2 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amxmodx/amxmodx.cpp
View File

@ -3579,6 +3579,8 @@ static cell AMX_NATIVE_CALL query_client_cvar(AMX *amx, cell *params)
pPlayer->queries.push_back(queryObject);
QUERY_CLIENT_CVAR_VALUE2(pPlayer->pEdict, cvarname, queryObject->requestId);
return 1;
}

104
amxmodx/modules.cpp
View File

@ -878,7 +878,6 @@ int loadModules(const char* filename, PLUG_LOADTIME now)
g_modules.put(cc);
#ifndef FAKEMETA
if (cc->IsMetamod())
{
char* mmpathname = build_pathname_addons("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), line.c_str());
@ -907,7 +906,6 @@ int loadModules(const char* filename, PLUG_LOADTIME now)
break;
}
}
#endif
}
fclose(fp);
@ -932,11 +930,7 @@ void detachReloadModules()
while (a)
{
#ifdef FAKEMETA
if ((*a).isReloadable())
#else
if ((*a).isReloadable() && !(*a).IsMetamod())
#endif
{
(*a).detachModule();
a.remove();
@ -947,38 +941,6 @@ void detachReloadModules()
}
}
#ifdef FAKEMETA
void attachModules()
{
CList<CModule, const char *>::iterator a = g_modules.begin();
while (a)
{
bool retVal = (*a).attachModule();
if ((*a).isAmxx() && !retVal)
{
switch ((*a).getStatusValue())
{
case MODULE_FUNCNOTPRESENT:
report_error(1, "[AMXX] Module requested a not exisitng function (file \"%s\")%s%s%s", (*a).getFilename(), (*a).getMissingFunc() ? " (func \"" : "",
(*a).getMissingFunc() ? (*a).getMissingFunc() : "", (*a).getMissingFunc() ? "\")" : "");
break;
case MODULE_INTERROR:
report_error(1, "[AMXX] Internal error during module load (file \"%s\")", (*a).getFilename());
break;
case MODULE_BADLOAD:
report_error(1, "[AMXX] Module is not a valid library (file \"%s\")", (*a).getFilename());
break;
default:
break;
}
}
++a;
}
}
#endif
const char* strip_name(const char* a)
{
const char* ret = a;
@ -996,72 +958,6 @@ const char* strip_name(const char* a)
return ret;
}
#ifdef FAKEMETA
void attachMetaModModules(PLUG_LOADTIME now, const char* filename)
{
File fp(build_pathname("%s", filename), "r");
if (!fp)
{
AMXXLOG_Log("[AMXX] Modules list not found (file \"%s\")", filename);
return;
}
char line[256], moduleName[256];
String modPath, mmPath;
DLHANDLE module;
while (fp.getline(line, 255))
{
*moduleName = 0;
sscanf(line, "%s", moduleName);
if (!isalnum(*moduleName))
continue;
char* pathname = build_pathname("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), line);
char* mmpathname = build_pathname_addons("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), line);
ConvertModuleName(pathname, modPath);
ConvertModuleName(mmpathname, mmPath);
CList<CFakeMeta::CFakeMetaPlugin>::iterator iter = g_FakeMeta.m_Plugins.begin();
//prevent double loading
int foundFlag = 0;
while (iter)
{
if (strcmp((*iter).GetPath(), mmPath.c_str()) == 0)
{
foundFlag = 1;
break;
}
++iter;
}
if (foundFlag)
continue;
module = DLLOAD(modPath.c_str()); // link dll
if (module)
{
int a = (int)DLPROC(module, "Meta_Attach");
DLFREE(module);
if (a)
{
g_FakeMeta.AddPlugin(mmPath.c_str());
}
}
}
g_FakeMeta.Meta_Query(gpMetaUtilFuncs);
g_FakeMeta.Meta_Attach(now, gpMetaGlobals, gpGamedllFuncs);
}
#endif
// Get the number of running modules
int countModules(CountModulesMode mode)
{