mirror of
https://github.com/alliedmodders/amxmodx.git
synced 2024-12-25 06:15:37 +03:00
- some indent stuff
- added support for MODULE_NOT64BIT status
This commit is contained in:
parent
dd4bc05952
commit
4b517fe1ad
@ -37,8 +37,8 @@ CList<CModule> g_modules;
|
|||||||
CList<CScript,AMX*> g_loadedscripts;
|
CList<CScript,AMX*> g_loadedscripts;
|
||||||
|
|
||||||
CModule *g_CurrentlyCalledModule = NULL; // The module we are in at the moment; NULL otherwise
|
CModule *g_CurrentlyCalledModule = NULL; // The module we are in at the moment; NULL otherwise
|
||||||
// also NULL for non-amxx modules
|
// also NULL for non-amxx modules
|
||||||
// This is needed so we know which module called a function
|
// This is needed so we know which module called a function
|
||||||
ModuleCallReason g_ModuleCallReason;
|
ModuleCallReason g_ModuleCallReason;
|
||||||
|
|
||||||
extern const char* no_function; // stupid work around
|
extern const char* no_function; // stupid work around
|
||||||
@ -393,11 +393,13 @@ int loadModules(const char* filename)
|
|||||||
case MODULE_INTERROR:
|
case MODULE_INTERROR:
|
||||||
report_error(1, "[AMXX] Internal error during module load (file \"%s\")", pathname);
|
report_error(1, "[AMXX] Internal error during module load (file \"%s\")", pathname);
|
||||||
break;
|
break;
|
||||||
|
case MODULE_NOT64BIT:
|
||||||
|
report_error(1, "[AMXX] Module \"%s\" is not 64 bit compatible.", pathname);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
++loaded;
|
++loaded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
g_modules.put( cc );
|
g_modules.put( cc );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -763,6 +765,16 @@ void MNF_HiddenStuff()
|
|||||||
// :TODO:
|
// :TODO:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cell MNF_RealToCell(REAL x)
|
||||||
|
{
|
||||||
|
return *(cell*)&x;
|
||||||
|
}
|
||||||
|
|
||||||
|
REAL MNF_CellToReal(cell x)
|
||||||
|
{
|
||||||
|
return *(REAL*)&x;
|
||||||
|
}
|
||||||
|
|
||||||
// Fnptr Request function for the new interface
|
// Fnptr Request function for the new interface
|
||||||
const char *g_LastRequestedFunc = NULL;
|
const char *g_LastRequestedFunc = NULL;
|
||||||
#define REGISTER_FUNC(name, func) { name, (void*)func },
|
#define REGISTER_FUNC(name, func) { name, (void*)func },
|
||||||
@ -831,6 +843,8 @@ void *Module_ReqFnptr(const char *funcName)
|
|||||||
REGISTER_FUNC("IsPlayerHLTV", MNF_IsPlayerHLTV)
|
REGISTER_FUNC("IsPlayerHLTV", MNF_IsPlayerHLTV)
|
||||||
REGISTER_FUNC("GetPlayerArmor", MNF_GetPlayerArmor)
|
REGISTER_FUNC("GetPlayerArmor", MNF_GetPlayerArmor)
|
||||||
REGISTER_FUNC("GetPlayerHealth", MNF_GetPlayerHealth)
|
REGISTER_FUNC("GetPlayerHealth", MNF_GetPlayerHealth)
|
||||||
|
REGISTER_FUNC("CellToReal", MNF_CellToReal)
|
||||||
|
REGISTER_FUNC("RealToCell", MNF_RealToCell)
|
||||||
|
|
||||||
#ifdef MEMORY_TEST
|
#ifdef MEMORY_TEST
|
||||||
REGISTER_FUNC("Allocator", m_allocator)
|
REGISTER_FUNC("Allocator", m_allocator)
|
||||||
|
Loading…
Reference in New Issue
Block a user