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

Reflect changes where game config functions are used

Browse Source
This commit is contained in:
Arkshine 2015-08-09 14:54:01 +02:00
parent 7423ac6824
commit f4f4d966f3
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
amxmodx/gameconfigs.cpp
View File

@ -54,7 +54,7 @@ static cell AMX_NATIVE_CALL GameConfGetOffset(AMX *amx, cell *params)
} }
int length; int length;
int value; TypeDescription value;
const char *key = get_amxstring(amx, params[2], 0, length); const char *key = get_amxstring(amx, params[2], 0, length);
@ -63,7 +63,7 @@ static cell AMX_NATIVE_CALL GameConfGetOffset(AMX *amx, cell *params)
return -1; return -1;
} }
return value; return value.fieldOffset;
} }
// native GameConfGetClassOffset(GameConfig:handle, const classname[], const key[]); // native GameConfGetClassOffset(GameConfig:handle, const classname[], const key[]);
@ -78,7 +78,7 @@ static cell AMX_NATIVE_CALL GameConfGetClassOffset(AMX *amx, cell *params)
} }
int length; int length;
int value; TypeDescription value;
const char *classname = get_amxstring(amx, params[2], 0, length); const char *classname = get_amxstring(amx, params[2], 0, length);
const char *key = get_amxstring(amx, params[3], 1, length); const char *key = get_amxstring(amx, params[3], 1, length);
@ -88,7 +88,7 @@ static cell AMX_NATIVE_CALL GameConfGetClassOffset(AMX *amx, cell *params)
return -1; return -1;
} }
return value; return value.fieldOffset;
} }
// native bool:GameConfGetKeyValue(GameConfig:handle, const key[], buffer[], maxlen); // native bool:GameConfGetKeyValue(GameConfig:handle, const key[], buffer[], maxlen);

30
modules/cstrike/cstrike/CstrikeHacks.cpp
View File

@ -39,8 +39,8 @@ UTIL_FindEntityByStringFunc CS_UTIL_FindEntityByString;
int CurrentItemId; int CurrentItemId;
StringHashMap<int> ItemAliasList; StringHashMap<int> ItemAliasList;
int TeamOffset; TypeDescription TeamDesc;
int MenuOffset; TypeDescription MenuDesc;
server_static_t *ServerStatic; server_static_t *ServerStatic;
server_t *Server; server_t *Server;
@ -130,11 +130,11 @@ DETOUR_DECL_STATIC1(C_ClientCommand, void, edict_t*, pEdict) // void ClientComma
/* Menu_BuyItem */ { 0, CSI_VEST, CSI_VESTHELM, CSI_FLASHBANG, CSI_HEGRENADE, CSI_SMOKEGRENADE, CSI_NVGS, CSI_DEFUSER, CSI_SHIELDGUN } /* Menu_BuyItem */ { 0, CSI_VEST, CSI_VESTHELM, CSI_FLASHBANG, CSI_HEGRENADE, CSI_SMOKEGRENADE, CSI_NVGS, CSI_DEFUSER, CSI_SHIELDGUN }
}; };
int menuId = get_pdata<int>(pEdict, MenuOffset); int menuId = get_pdata<int>(pEdict, MenuDesc.fieldOffset);
if (menuId >= Menu_Buy && menuId <= Menu_BuyItem) if (menuId >= Menu_Buy && menuId <= Menu_BuyItem)
{ {
switch (get_pdata<int>(pEdict, TeamOffset)) switch (get_pdata<int>(pEdict, TeamDesc.fieldOffset))
{ {
case TEAM_T: itemId = menuItemsTe[menuId - 4][slot]; break; // -4 because array is zero-based and Menu_Buy* constants starts from 4. case TEAM_T: itemId = menuItemsTe[menuId - 4][slot]; break; // -4 because array is zero-based and Menu_Buy* constants starts from 4.
case TEAM_CT:itemId = menuItemsCt[menuId - 4][slot]; break; case TEAM_CT:itemId = menuItemsCt[menuId - 4][slot]; break;
@ -278,16 +278,16 @@ void CtrlDetours_ClientCommand(bool set)
#if defined(WIN32) #if defined(WIN32)
int offset = 0; TypeDescription type;
if (MainConfig->GetOffset("UseBotArgs", &offset)) if (MainConfig->GetOffset("UseBotArgs", &type))
{ {
UseBotArgs = get_pdata<int*>(base, offset); UseBotArgs = get_pdata<int*>(base, type.fieldOffset);
} }
if (MainConfig->GetOffset("BotArgs", &offset)) if (MainConfig->GetOffset("BotArgs", &type))
{ {
BotArgs = get_pdata<const char**>(base, offset); BotArgs = get_pdata<const char**>(base, type.fieldOffset);
} }
#elif defined(__linux__) || defined(__APPLE__) #elif defined(__linux__) || defined(__APPLE__)
@ -306,10 +306,10 @@ void CtrlDetours_ClientCommand(bool set)
#endif #endif
ClientCommandDetour = DETOUR_CREATE_STATIC_FIXED(C_ClientCommand, base); ClientCommandDetour = DETOUR_CREATE_STATIC_FIXED(C_ClientCommand, base);
CommonConfig->GetOffsetByClass("CBasePlayer", "m_iTeam", &TeamOffset); CommonConfig->GetOffsetByClass("CBasePlayer", "m_iTeam", &TeamDesc);
CommonConfig->GetOffsetByClass("CBasePlayer", "m_iMenu", &MenuOffset); CommonConfig->GetOffsetByClass("CBasePlayer", "m_iMenu", &MenuDesc);
if (!ClientCommandDetour || !UseBotArgs || !BotArgs || !TeamOffset || !MenuOffset) if (!ClientCommandDetour || !UseBotArgs || !BotArgs || !TeamDesc.fieldOffset || !MenuDesc.fieldOffset)
{ {
MF_Log("ClientCommand is not available - forward client_command has been disabled"); MF_Log("ClientCommand is not available - forward client_command has been disabled");
} }
@ -518,11 +518,11 @@ void InitGlobalVars()
#if defined(WIN32) #if defined(WIN32)
int offset = 0; TypeDescription typeDesc;
if (CommonConfig->GetOffset("svs", &offset)) if (CommonConfig->GetOffset("svs", &typeDesc))
{ {
uintptr_t base = *reinterpret_cast<uintptr_t*>(reinterpret_cast<byte*>(g_engfuncs.pfnGetCurrentPlayer) + offset); uintptr_t base = *reinterpret_cast<uintptr_t*>(reinterpret_cast<byte*>(g_engfuncs.pfnGetCurrentPlayer) + typeDesc.fieldOffset);
ServerStatic = reinterpret_cast<server_static_t*>(base - 4); ServerStatic = reinterpret_cast<server_static_t*>(base - 4);
} }
#else #else

14
modules/cstrike/cstrike/CstrikeUtils.h
View File

@ -77,22 +77,26 @@ bool UTIL_CheckForPublic(const char *publicname);
#define GET_OFFSET(classname, member) \ #define GET_OFFSET(classname, member) \
static int member = -1; \ static int member = -1; \
if (member == -1) \ if (member == -1) \
{ \ { \
if (!CommonConfig->GetOffsetByClass(classname, #member, &member) || member < 0)\ TypeDescription type; \
if (!CommonConfig->GetOffsetByClass(classname, #member, &type) || type.fieldOffset < 0)\
{ \ { \
MF_LogError(amx, AMX_ERR_NATIVE, "Invalid %s offset. Native %s is disabled", #member, __FUNCTION__);\ MF_LogError(amx, AMX_ERR_NATIVE, "Invalid %s offset. Native %s is disabled", #member, __FUNCTION__);\
return 0; \ return 0; \
} \ } \
member = type.fieldOffset; \
} }
#define GET_OFFSET_NO_ERROR(classname, member) \ #define GET_OFFSET_NO_ERROR(classname, member) \
static int member = -1; \ static int member = -1; \
if (member == -1) \ if (member == -1) \
{ \ { \
if (!CommonConfig->GetOffsetByClass(classname, #member, &member) || member < 0)\ TypeDescription type; \
if (!CommonConfig->GetOffsetByClass(classname, #member, &type) || type.fieldOffset < 0)\
{ \ { \
return; \ return; \
} \ } \
member = type.fieldOffset; \
} }
template <typename T> template <typename T>