[ScriptError]: Use macro I forgot about (#754)

This commit is contained in:
Edo 2023-02-06 12:50:40 +00:00 committed by GitHub
parent 4ac1987051
commit d06092de80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 1 deletions

View File

@ -221,7 +221,7 @@ namespace Components
} }
} }
assert(0 && "unreachable"); AssertUnreachable;
return nullptr; return nullptr;
} }

View File

@ -256,6 +256,8 @@ namespace Game
LargeLocalBeginRight_t LargeLocalBeginRight = LargeLocalBeginRight_t(0x644140); LargeLocalBeginRight_t LargeLocalBeginRight = LargeLocalBeginRight_t(0x644140);
LargeLocalReset_t LargeLocalReset = LargeLocalReset_t(0x430630); LargeLocalReset_t LargeLocalReset = LargeLocalReset_t(0x430630);
StructuredDataDef_GetAsset_t StructuredDataDef_GetAsset = StructuredDataDef_GetAsset_t(0x4D5C50);
longjmp_internal_t longjmp_internal = longjmp_internal_t(0x6B8898); longjmp_internal_t longjmp_internal = longjmp_internal_t(0x6B8898);
CmdArgs* cmd_args = reinterpret_cast<CmdArgs*>(0x1AAC5D0); CmdArgs* cmd_args = reinterpret_cast<CmdArgs*>(0x1AAC5D0);

View File

@ -587,6 +587,9 @@ namespace Game
typedef void(*LargeLocalReset_t)(); typedef void(*LargeLocalReset_t)();
extern LargeLocalReset_t LargeLocalReset; extern LargeLocalReset_t LargeLocalReset;
typedef StructuredDataDef*(*StructuredDataDef_GetAsset_t)(const char* filename, unsigned int maxSize);
extern StructuredDataDef_GetAsset_t StructuredDataDef_GetAsset;
typedef void(*longjmp_internal_t)(jmp_buf env, int status); typedef void(*longjmp_internal_t)(jmp_buf env, int status);
extern longjmp_internal_t longjmp_internal; extern longjmp_internal_t longjmp_internal;

View File

@ -49,6 +49,7 @@ namespace Game
Scr_Notify_t Scr_Notify = Scr_Notify_t(0x4A4750); Scr_Notify_t Scr_Notify = Scr_Notify_t(0x4A4750);
Scr_NotifyLevel_t Scr_NotifyLevel = Scr_NotifyLevel_t(0x4D9C30); Scr_NotifyLevel_t Scr_NotifyLevel = Scr_NotifyLevel_t(0x4D9C30);
Scr_ErrorInternal_t Scr_ErrorInternal = Scr_ErrorInternal_t(0x61DB10);
Scr_Error_t Scr_Error = Scr_Error_t(0x61E8B0); Scr_Error_t Scr_Error = Scr_Error_t(0x61E8B0);
Scr_ObjectError_t Scr_ObjectError = Scr_ObjectError_t(0x42EF40); Scr_ObjectError_t Scr_ObjectError = Scr_ObjectError_t(0x42EF40);
Scr_ParamError_t Scr_ParamError = Scr_ParamError_t(0x4FBC70); Scr_ParamError_t Scr_ParamError = Scr_ParamError_t(0x4FBC70);

View File

@ -143,6 +143,9 @@ namespace Game
typedef int(*Scr_GetPointerType_t)(unsigned int index); typedef int(*Scr_GetPointerType_t)(unsigned int index);
extern Scr_GetPointerType_t Scr_GetPointerType; extern Scr_GetPointerType_t Scr_GetPointerType;
typedef void(*Scr_ErrorInternal_t)();
extern Scr_ErrorInternal_t Scr_ErrorInternal;
typedef void(*Scr_Error_t)(const char* error); typedef void(*Scr_Error_t)(const char* error);
extern Scr_Error_t Scr_Error; extern Scr_Error_t Scr_Error;

View File

@ -20,6 +20,8 @@ namespace Game
SV_GetPlayerByNum_t SV_GetPlayerByNum = SV_GetPlayerByNum_t(0x624390); SV_GetPlayerByNum_t SV_GetPlayerByNum = SV_GetPlayerByNum_t(0x624390);
SV_FindClientByAddress_t SV_FindClientByAddress = SV_FindClientByAddress_t(0x44F450); SV_FindClientByAddress_t SV_FindClientByAddress = SV_FindClientByAddress_t(0x44F450);
SV_WaitServer_t SV_WaitServer = SV_WaitServer_t(0x4256F0); SV_WaitServer_t SV_WaitServer = SV_WaitServer_t(0x4256F0);
SV_GetClientPersistentDataBuffer_t SV_GetClientPersistentDataBuffer = SV_GetClientPersistentDataBuffer_t(0x4014C0);
SV_GetClientPersistentDataModifiedFlags_t SV_GetClientPersistentDataModifiedFlags = SV_GetClientPersistentDataModifiedFlags_t(0x4F4AC0);
int* svs_time = reinterpret_cast<int*>(0x31D9384); int* svs_time = reinterpret_cast<int*>(0x31D9384);
int* sv_timeResidual = reinterpret_cast<int*>(0x2089E14); int* sv_timeResidual = reinterpret_cast<int*>(0x2089E14);

View File

@ -56,6 +56,12 @@ namespace Game
typedef void(*SV_WaitServer_t)(); typedef void(*SV_WaitServer_t)();
extern SV_WaitServer_t SV_WaitServer; extern SV_WaitServer_t SV_WaitServer;
typedef char*(*SV_GetClientPersistentDataBuffer_t)(int clientNum);
extern SV_GetClientPersistentDataBuffer_t SV_GetClientPersistentDataBuffer;
typedef char*(*SV_GetClientPersistentDataModifiedFlags_t)(int clientNum);
extern SV_GetClientPersistentDataModifiedFlags_t SV_GetClientPersistentDataModifiedFlags;
constexpr auto MAX_STATPACKETS = 7; constexpr auto MAX_STATPACKETS = 7;
extern int* svs_time; extern int* svs_time;