Rim/iw5-mod
Rim/iw5-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

maint: cleanup game definitions

Browse Source
This commit is contained in:
Diavolo 2023-01-11 12:12:49 +01:00
parent 08026b451f
commit aa102174c4
No known key found for this signature in database
GPG Key ID: FA77F074E98D98A5
2 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/game/game.cpp
View File

@ -10,6 +10,7 @@ namespace game
Cmd_RemoveCommand_t Cmd_RemoveCommand; Cmd_RemoveCommand_t Cmd_RemoveCommand;
Cbuf_AddText_t Cbuf_AddText; Cbuf_AddText_t Cbuf_AddText;
Conbuf_AppendText_t Conbuf_AppendText;
Com_Error_t Com_Error; Com_Error_t Com_Error;
Com_Filter_t Com_Filter; Com_Filter_t Com_Filter;
@ -19,6 +20,8 @@ namespace game
DB_IsXAssetDefault_t DB_IsXAssetDefault; DB_IsXAssetDefault_t DB_IsXAssetDefault;
Dvar_RegisterBool_t Dvar_RegisterBool; Dvar_RegisterBool_t Dvar_RegisterBool;
Dvar_RegisterFloat_t Dvar_RegisterFloat;
Dvar_RegisterInt_t Dvar_RegisterInt;
Dvar_RegisterString_t Dvar_RegisterString; Dvar_RegisterString_t Dvar_RegisterString;
Dvar_SetIntByName_t Dvar_SetIntByName; Dvar_SetIntByName_t Dvar_SetIntByName;
@ -37,7 +40,9 @@ namespace game
MT_AllocIndex_t MT_AllocIndex; MT_AllocIndex_t MT_AllocIndex;
FindVariable_t FindVariable;
RemoveRefToValue_t RemoveRefToValue; RemoveRefToValue_t RemoveRefToValue;
GetEntityFieldValue_t GetEntityFieldValue;
SL_GetStringOfSize_t SL_GetStringOfSize; SL_GetStringOfSize_t SL_GetStringOfSize;
@ -202,21 +207,6 @@ namespace game
} }
} }
void Conbuf_AppendText(const char* message)
{
reinterpret_cast<void(*)(const char*)>(SELECT_VALUE(0x4C84E0, 0x5CF610))(message);
}
unsigned int FindVariable(const unsigned int parentId, const unsigned int name)
{
return reinterpret_cast<unsigned int(*)(unsigned int, unsigned int)>(SELECT_VALUE(0x4C4E70, 0x5651F0))(parentId, name);
}
VariableValue GetEntityFieldValue(const unsigned int classnum, const int entnum, const int offset)
{
return reinterpret_cast<VariableValue(*)(unsigned int, int, int)>(SELECT_VALUE(0x530E30, 0x56AF20))(classnum, entnum, offset);
}
void* MT_Alloc(const int numBytes, const int type) void* MT_Alloc(const int numBytes, const int type)
{ {
return scrMemTreeGlob + 12 * size_t(MT_AllocIndex(numBytes, type)); return scrMemTreeGlob + 12 * size_t(MT_AllocIndex(numBytes, type));
@ -227,20 +217,6 @@ namespace game
return reinterpret_cast<dvar_t*(*)(const char*)>(SELECT_VALUE(0x539550, 0x5BDCC0))(dvarName); return reinterpret_cast<dvar_t*(*)(const char*)>(SELECT_VALUE(0x539550, 0x5BDCC0))(dvarName);
} }
const dvar_t* Dvar_RegisterFloat(const char* dvarName, float value,
float min, float max, unsigned __int16 flags, const char* description)
{
return reinterpret_cast<const dvar_t*(*)(const char*, float, float, float, unsigned __int16, const char*)> //
(SELECT_VALUE(0x4F9CC0, 0x5BEA80))(dvarName, value, min, max, flags, description);
}
const dvar_t* Dvar_RegisterInt(const char* dvarName, int value,
int min, int max, unsigned __int16 flags, const char* description)
{
return reinterpret_cast<const dvar_t*(*)(const char*, int, int, int, unsigned __int16, const char*)> //
(SELECT_VALUE(0x48CD40, 0x5BEA40))(dvarName, value, min, max, flags, description);
}
void IncInParam() void IncInParam()
{ {
Scr_ClearOutParams(); Scr_ClearOutParams();
@ -692,6 +668,7 @@ namespace game
native::Cmd_RemoveCommand = native::Cmd_RemoveCommand_t(SELECT_VALUE(0x443A30, 0x545E20)); native::Cmd_RemoveCommand = native::Cmd_RemoveCommand_t(SELECT_VALUE(0x443A30, 0x545E20));
native::Cbuf_AddText = native::Cbuf_AddText_t(SELECT_VALUE(0x457C90, 0x545680)); native::Cbuf_AddText = native::Cbuf_AddText_t(SELECT_VALUE(0x457C90, 0x545680));
native::Conbuf_AppendText = native::Conbuf_AppendText_t(SELECT_VALUE(0x4C84E0, 0x5CF610));
native::Com_Error = native::Com_Error_t(SELECT_VALUE(0x425540, 0x555450)); native::Com_Error = native::Com_Error_t(SELECT_VALUE(0x425540, 0x555450));
native::Com_Filter = native::Com_Filter_t(SELECT_VALUE(0x44EFF0, 0x5B7C30)); native::Com_Filter = native::Com_Filter_t(SELECT_VALUE(0x44EFF0, 0x5B7C30));
@ -701,6 +678,8 @@ namespace game
native::DB_IsXAssetDefault = native::DB_IsXAssetDefault_t(SELECT_VALUE(0x4868E0, 0x4CA800)); native::DB_IsXAssetDefault = native::DB_IsXAssetDefault_t(SELECT_VALUE(0x4868E0, 0x4CA800));
native::Dvar_RegisterBool = native::Dvar_RegisterBool_t(SELECT_VALUE(0x4914D0, 0x5BE9F0)); native::Dvar_RegisterBool = native::Dvar_RegisterBool_t(SELECT_VALUE(0x4914D0, 0x5BE9F0));
native::Dvar_RegisterFloat = native::Dvar_RegisterFloat_t(SELECT_VALUE(0x4F9CC0, 0x5BEA80));
native::Dvar_RegisterInt = native::Dvar_RegisterInt_t(SELECT_VALUE(0x48CD40, 0x5BEA40));
native::Dvar_RegisterString = native::Dvar_RegisterString_t(SELECT_VALUE(0x5197F0, 0x5BEC90)); native::Dvar_RegisterString = native::Dvar_RegisterString_t(SELECT_VALUE(0x5197F0, 0x5BEC90));
native::Dvar_SetIntByName = native::Dvar_SetIntByName_t(SELECT_VALUE(0x5396B0, 0x5BF560)); native::Dvar_SetIntByName = native::Dvar_SetIntByName_t(SELECT_VALUE(0x5396B0, 0x5BF560));
@ -719,7 +698,9 @@ namespace game
native::MT_AllocIndex = native::MT_AllocIndex_t(SELECT_VALUE(0x4B9610, 0x562080)); native::MT_AllocIndex = native::MT_AllocIndex_t(SELECT_VALUE(0x4B9610, 0x562080));
native::FindVariable = native::FindVariable_t(SELECT_VALUE(0x4C4E70, 0x5651F0));
native::RemoveRefToValue = native::RemoveRefToValue_t(SELECT_VALUE(0x477EA0, 0x565730)); native::RemoveRefToValue = native::RemoveRefToValue_t(SELECT_VALUE(0x477EA0, 0x565730));
native::GetEntityFieldValue = native::GetEntityFieldValue_t(SELECT_VALUE(0x530E30, 0x56AF20));
native::SL_GetStringOfSize = native::SL_GetStringOfSize_t(SELECT_VALUE(0x4E13F0, 0x564650)); native::SL_GetStringOfSize = native::SL_GetStringOfSize_t(SELECT_VALUE(0x4E13F0, 0x564650));

29
src/game/game.hpp
View File

@ -20,6 +20,9 @@ namespace game
typedef void (*Cbuf_AddText_t)(LocalClientNum_t localClientNum, const char* text); typedef void (*Cbuf_AddText_t)(LocalClientNum_t localClientNum, const char* text);
extern Cbuf_AddText_t Cbuf_AddText; extern Cbuf_AddText_t Cbuf_AddText;
typedef void (*Conbuf_AppendText_t)(const char* message);
extern Conbuf_AppendText_t Conbuf_AppendText;
typedef void (*Com_Error_t)(errorParm_t code, const char* fmt, ...); typedef void (*Com_Error_t)(errorParm_t code, const char* fmt, ...);
extern Com_Error_t Com_Error; extern Com_Error_t Com_Error;
@ -35,12 +38,16 @@ namespace game
typedef int (*DB_IsXAssetDefault_t)(XAssetType type, const char* name); typedef int (*DB_IsXAssetDefault_t)(XAssetType type, const char* name);
extern DB_IsXAssetDefault_t DB_IsXAssetDefault; extern DB_IsXAssetDefault_t DB_IsXAssetDefault;
typedef const dvar_t* (*Dvar_RegisterBool_t)(const char* dvarName, bool value, typedef const dvar_t* (*Dvar_RegisterBool_t)(const char* dvarName, bool value, unsigned __int16 flags, const char* description);
unsigned __int16 flags, const char* description);
extern Dvar_RegisterBool_t Dvar_RegisterBool; extern Dvar_RegisterBool_t Dvar_RegisterBool;
typedef const dvar_t* (*Dvar_RegisterString_t)(const char* dvarName, const char* value, typedef const dvar_t* (*Dvar_RegisterFloat_t)(const char* dvarName, float value, float min, float max, unsigned __int16 flags, const char* description);
unsigned __int16 flags, const char* description); extern Dvar_RegisterFloat_t Dvar_RegisterFloat;
typedef const dvar_t* (*Dvar_RegisterInt_t)(const char* dvarName, int value, int min, int max, unsigned __int16 flags, const char* description);
extern Dvar_RegisterInt_t Dvar_RegisterInt;
typedef const dvar_t* (*Dvar_RegisterString_t)(const char* dvarName, const char* value, unsigned __int16 flags, const char* description);
extern Dvar_RegisterString_t Dvar_RegisterString; extern Dvar_RegisterString_t Dvar_RegisterString;
typedef void (*Dvar_SetIntByName_t)(const char* dvarName, int value); typedef void (*Dvar_SetIntByName_t)(const char* dvarName, int value);
@ -73,9 +80,15 @@ namespace game
typedef void* (*MT_AllocIndex_t)(int numBytes, int type); typedef void* (*MT_AllocIndex_t)(int numBytes, int type);
extern MT_AllocIndex_t MT_AllocIndex; extern MT_AllocIndex_t MT_AllocIndex;
typedef unsigned int (*FindVariable_t)(unsigned int parentId, unsigned int name);
extern FindVariable_t FindVariable;
typedef void (*RemoveRefToValue_t)(int type, VariableUnion u); typedef void (*RemoveRefToValue_t)(int type, VariableUnion u);
extern RemoveRefToValue_t RemoveRefToValue; extern RemoveRefToValue_t RemoveRefToValue;
typedef VariableValue (*GetEntityFieldValue_t)(unsigned int classnum, int entnum, int offset);
extern GetEntityFieldValue_t GetEntityFieldValue;
typedef unsigned int (*SL_GetStringOfSize_t)(const char* str, unsigned int user, unsigned int len, int type); typedef unsigned int (*SL_GetStringOfSize_t)(const char* str, unsigned int user, unsigned int len, int type);
extern SL_GetStringOfSize_t SL_GetStringOfSize; extern SL_GetStringOfSize_t SL_GetStringOfSize;
@ -306,17 +319,9 @@ namespace game
void AddRefToValue(VariableValue* value); void AddRefToValue(VariableValue* value);
void Conbuf_AppendText(const char* message);
unsigned int FindVariable(unsigned int parentId, unsigned int name);
VariableValue GetEntityFieldValue(unsigned int classnum, int entnum, int offset);
void* MT_Alloc(int numBytes, int type); void* MT_Alloc(int numBytes, int type);
dvar_t* Dvar_FindVar(const char* dvarName); dvar_t* Dvar_FindVar(const char* dvarName);
const dvar_t* Dvar_RegisterFloat(const char* dvarName, float value, float min, float max, unsigned __int16 flags, const char* description);
const dvar_t* Dvar_RegisterInt(const char* dvarName, int value, int min, int max, unsigned __int16 flags, const char* description);
const float* Scr_AllocVector(const float* v); const float* Scr_AllocVector(const float* v);
void Scr_ClearOutParams(); void Scr_ClearOutParams();