Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix rebase changes

Browse Source
This commit is contained in:
Jari van der Kaap 2023-02-03 00:02:47 +01:00
parent d25d6a7c10
commit aab395c4ef
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/game/structs.hpp
View File

@ -4,11 +4,6 @@
namespace game namespace game
{ {
#endif #endif
enum XAssetType
{
ASSET_TYPE_LEADERBOARD = 0x32,
ASSET_TYPE_DDL = 0x33,
};
enum ControllerIndex_t enum ControllerIndex_t
{ {
@ -539,12 +534,6 @@ namespace game
const char* buffer; const char* buffer;
}; };
union XAssetHeader
{
void* data;
LuaFile* luaFile;
};
struct XZoneBuffer struct XZoneBuffer
{ {
const void* data; const void* data;
@ -1664,7 +1653,8 @@ namespace game
LaserDef* laserDef; LaserDef* laserDef;
BeamDef* beamDef; BeamDef* beamDef;
StreamerHint* streamerHint;*/ StreamerHint* streamerHint;*/
void* data; void* data;
LuaFile* luaFile;
}; };
struct XAsset struct XAsset

5
src/client/game/symbols.hpp
View File

@ -28,7 +28,7 @@ namespace game
WEAK symbol<void(uint32_t localClientNum, const char* text)> Cbuf_AddText{0x1420EC8B0, 0x1404F75B0}; WEAK symbol<void(uint32_t localClientNum, const char* text)> Cbuf_AddText{0x1420EC8B0, 0x1404F75B0};
WEAK symbol<void(int localClientNum, ControllerIndex_t controllerIndex, const char* buffer)> Cbuf_ExecuteBuffer{ WEAK symbol<void(int localClientNum, ControllerIndex_t controllerIndex, const char* buffer)> Cbuf_ExecuteBuffer{
0x0, 0x1404F78D0 0x14133BE10, 0x1404F78D0
}; };
WEAK symbol<void(const char* cmdName, xcommand_t function, cmd_function_s* allocedCmd)> Cmd_AddCommandInternal{ WEAK symbol<void(const char* cmdName, xcommand_t function, cmd_function_s* allocedCmd)> Cmd_AddCommandInternal{
0x1420ED530, 0x1404F8210 0x1420ED530, 0x1404F8210
@ -43,7 +43,6 @@ namespace game
0x1420EDC20 0x1420EDC20
}; };
WEAK symbol<void(char* text, int maxSize)> Con_GetTextCopy{0x14133A7D0, 0x140182C40}; WEAK symbol<void(char* text, int maxSize)> Con_GetTextCopy{0x14133A7D0, 0x140182C40};
WEAK symbol<void(uint32_t localClientNum, ControllerIndex_t controllerIndex, const char* buffer)> Cbuf_ExecuteBuffer{0x14133BE10};
// DB // DB
WEAK symbol<void(XZoneInfo* zoneInfo, uint32_t zoneCount, bool sync, bool suppressSync)> DB_LoadXAssets{ WEAK symbol<void(XZoneInfo* zoneInfo, uint32_t zoneCount, bool sync, bool suppressSync)> DB_LoadXAssets{
@ -76,7 +75,7 @@ namespace game
WEAK symbol<TLSData*()> Sys_IsDatabaseReady{0x1421844C0}; WEAK symbol<TLSData*()> Sys_IsDatabaseReady{0x1421844C0};
// Dvar // Dvar
WEAK symbol<const dvar_t*(const char* dvarName)> Dvar_FindVar{0x1422BD730, 0x140575540}; WEAK symbol<dvar_t*(const char* dvarName)> Dvar_FindVar{0x1422BD730, 0x140575540};
WEAK symbol<unsigned int(const char* str)> Dvar_GenerateHash{0x14133DBF0}; WEAK symbol<unsigned int(const char* str)> Dvar_GenerateHash{0x14133DBF0};
WEAK symbol<dvar_t*(unsigned int hash)> Dvar_FindMalleableVar{0x1422BD6A0}; WEAK symbol<dvar_t*(unsigned int hash)> Dvar_FindMalleableVar{0x1422BD6A0};
WEAK symbol<const char*(const dvar_t* dvar)> Dvar_GetDebugName{0x1422BDCB0}; WEAK symbol<const char*(const dvar_t* dvar)> Dvar_GetDebugName{0x1422BDCB0};