From 7954966c6013c8eaf6152e0518533ee4ee1e3949 Mon Sep 17 00:00:00 2001 From: Caball Date: Tue, 31 Dec 2024 00:12:38 +0100 Subject: [PATCH] Updated function symbols and references. Replaced all occurrences of 0x0 with 0 for consistency. --- src/client/component/branding.cpp | 3 +- src/client/component/input.cpp | 4 +- src/client/component/slowmotion.cpp | 2 +- src/client/game/symbols.hpp | 81 ++++++++++++++++++++--------- 4 files changed, 59 insertions(+), 31 deletions(-) diff --git a/src/client/component/branding.cpp b/src/client/component/branding.cpp index 3602fb4..d963862 100644 --- a/src/client/component/branding.cpp +++ b/src/client/component/branding.cpp @@ -41,8 +41,7 @@ namespace branding localized_strings::override("LUA_MENU_LEGAL_COPYRIGHT", "iw6-mod: " VERSION " by AlterWare.\n"); utils::hook::call(SELECT_VALUE(0x1403BDABA, 0x140414424), dvar_set_string_stub); - ui_get_formatted_build_number_hook.create( - SELECT_VALUE(0x140415FD0, 0x1404D7C00), ui_get_formatted_build_number_stub); + ui_get_formatted_build_number_hook.create(game::LiveStorage_FetchFFotD, ui_get_formatted_build_number_stub); scheduler::loop([]() { diff --git a/src/client/component/input.cpp b/src/client/component/input.cpp index 6c3ecb9..beffee2 100644 --- a/src/client/component/input.cpp +++ b/src/client/component/input.cpp @@ -50,8 +50,8 @@ namespace input return; } - cl_char_event_hook.create(SELECT_VALUE(0x14023CE50, 0x1402C2AE0), cl_char_event_stub); - cl_key_event_hook.create(SELECT_VALUE(0x14023D070, 0x1402C2CE0), cl_key_event_stub); + cl_char_event_hook.create(game::CL_CharEvent, cl_char_event_stub); + cl_key_event_hook.create(game::CL_KeyEvent, cl_key_event_stub); } }; } diff --git a/src/client/component/slowmotion.cpp b/src/client/component/slowmotion.cpp index dac5286..42302e3 100644 --- a/src/client/component/slowmotion.cpp +++ b/src/client/component/slowmotion.cpp @@ -66,7 +66,7 @@ namespace slowmotion utils::hook::jump(0x1403B4A10, scr_cmd_set_slow_motion); // Detour used here instead of call hook because Com_TimeScaleMsec is called from arxan encrypted function - com_timescale_msec_hook.create(0x140415D50, com_timescale_msec); + com_timescale_msec_hook.create(game::Com_TimeScaleMsec, com_timescale_msec); } }; } diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp index d517a3a..6e4b74d 100644 --- a/src/client/game/symbols.hpp +++ b/src/client/game/symbols.hpp @@ -36,15 +36,31 @@ namespace game WEAK symbol Cbuf_AddText{0x1403B3050, 0x1403F6B50}; WEAK symbol Cbuf_ExecuteBufferInternal{0x1403B3160, 0x1403F6C60}; - WEAK symbol CL_IsCgameInitialized{0x140234DA0, 0x1402B9A70}; - + WEAK symbol CG_ExecuteNewServerCommands{0, 0x140288500}; WEAK symbol CG_GameMessage{0x1401F2E20, 0x140271320}; - WEAK symbol CG_SetClientDvarFromServer{0x0, 0x14028A2C0}; + WEAK symbol CG_GetVehicleDef{0, 0x140229760}; + WEAK symbol CG_HandleTurretFire{0, 0x140269DF0}; + WEAK symbol CG_SetClientDvarFromServer{0, 0x14028A2C0}; + WEAK symbol CG_UpdateOmnvars{0, 0x14028E770}; + + WEAK symbol CL_CharEvent{0x14023CE50, 0x1402C2AE0}; + WEAK symbol CL_GetClientNameColorize{0, 0x1402CFA60}; + WEAK symbol CL_GetPredictedPlayerInformationForServerTime{0, 0x1402CC710}; + WEAK symbol CL_GetPredictedVehicleForServerTime{0, 0x1402CC7F0}; + WEAK symbol CL_IsCgameInitialized{0x140234DA0, 0x1402B9A70}; + WEAK symbol CL_KeyEvent{0x14023D070, 0x1402C2CE0}; + WEAK symbol CL_ParseServerMessage{0, 0x1402CDFC0}; + WEAK symbol CG_SelectWeapon{0, 0x1402AB310}; + WEAK symbol CL_SetCGameTime{0, 0x1402B9D80}; + WEAK symbol CL_WritePacket{0, 0x1402C1E70}; WEAK symbol Cmd_AddCommandInternal{0x1403B3570, 0x1403F7070}; WEAK symbol Cmd_ExecuteSingleCommand{0x1403B3B10, 0x1403F7680}; + WEAK symbol Com_TimeScaleMsec{0, 0x140415D50}; - WEAK symbol DB_EnumXAssets_FastFile{0x140271F50, 0x14031EF90}; + WEAK symbol DB_EnumXAssets_FastFile{0x140271F50, 0x14031EF90}; WEAK symbol DB_EnumXAssets_Internal{0x140271FC0, 0x14031F000}; WEAK symbol DB_FindXAssetEntry{0x140272230, 0x14031F2D0}; WEAK symbol DB_GetXAssetName{0x14024FB10, 0x1402FB160}; @@ -54,11 +70,11 @@ namespace game WEAK symbol DB_FindXAssetHeader{0x140272300, 0x14031F3A0}; WEAK symbol DB_XAssetExists{0x140276200, 0x1403245E0}; WEAK symbol DB_IsXAssetDefault{0x140273480 , 0x1403204D0}; - WEAK symbol DB_GetRawFileLen{0x0140272E80, 0x14031FF80}; + WEAK symbol DB_GetRawFileLen{0x140272E80, 0x14031FF80}; WEAK symbol DB_GetRawBuffer{0x140272D50, 0x14031FE50}; WEAK symbol DB_IsLocalized{0x140273210, 0x140320360}; - WEAK symbol PMem_AllocFromSource_NoDebug{0x0140430B80, 0x001404F46C0}; + WEAK symbol PMem_AllocFromSource_NoDebug{0x140430B80, 0x001404F46C0}; WEAK symbol PMem_Free{0x140430EC0 , 0x1404F4A30}; WEAK symbol Hunk_AllocateTempMemoryHighInternal{0x140423C70, 0x1404E4E20}; @@ -93,6 +109,8 @@ namespace game WEAK symbol FS_AddGameDirectory{0x14041A120, 0x1404DC570}; WEAK symbol FS_AddLocalizedGameDirectory{0x14041A2F0, 0x1404DC760}; + WEAK symbol GetRemoteEyeValues{0, 0x1402A0190}; + WEAK symbol G_FindItem{0x140462490, 0x14021B7E0}; WEAK symbol G_GivePlayerWeapon{0x140359E20, 0x1403DA5E0}; WEAK symbol G_GetWeaponForName{0x140359890, 0x1403DA060}; @@ -101,10 +119,10 @@ namespace game WEAK symbol G_SelectWeapon{0x14035A200, 0x1403DA880}; WEAK symbol G_TakePlayerWeapon{0x14035A350, 0x1403DA9C0}; WEAK symbol G_FindConfigstringIndex{0x0, 0x140161F90}; - WEAK symbol G_RunFrame{0x0, 0x1403A05E0}; + const char* errormsg)> G_FindConfigstringIndex{0, 0x140161F90}; + WEAK symbol G_RunFrame{0, 0x1403A05E0}; - WEAK symbol HudElem_Alloc{0x0, 0x1403997E0}; + WEAK symbol HudElem_Alloc{0, 0x1403997E0}; WEAK symbol I_CleanStr{0x140432460, 0x1404F63C0}; @@ -116,6 +134,7 @@ namespace game WEAK symbol Live_SyncOnlineDataFlags{0, 0x1405ABF70}; + WEAK symbol LiveStorage_FetchFFotD{0x140415FD0, 0x1404D7C00}; WEAK symbol LiveStorage_PlayerDataSetIntByName{0x1403B8C20, 0x140404730}; WEAK symbol LiveStorage_PlayerDataSetReservedInt{0x1403B8D00, 0x140404820}; WEAK symbol LiveStorage_PlayerDataGetReservedInt{0x1403B84F0, 0x140403CF0}; @@ -135,24 +154,30 @@ namespace game WEAK symbol StringTable_GetColumnValueForRow{0, 0x1404E61A0}; WEAK symbol StringTable_LookupRowNumForValue{0, 0x1404E6260}; + WEAK symbol LUI_IntermissionBegan{0, 0x1401CEB40}; WEAK symbol LUI_OpenMenu{0x1403FD460, 0x1404B3610}; // Made up name, replaced by ScopedCriticalSection on Black Ops 3 WEAK symbol LUI_EnterCriticalSection{0x1401AE940, 0x1401CD040}; WEAK symbol LUI_LeaveCriticalSection{0x1401B0AA0, 0x1401CF1A0}; - WEAK symbol Menu_IsMenuOpenAndVisible{0x0, 0x1404B38A0}; + WEAK symbol Menu_IsMenuOpenAndVisible{0, 0x1404B38A0}; WEAK symbol Material_RegisterHandle{0x140523D90, 0x1405F0E20}; + WEAK symbol MSG_ReadLong{0, 0x1404181C0}; + WEAK symbol MSG_WriteBits{0, 0x140418740}; + WEAK symbol NET_OutOfBandPrint{0, 0x14041D5C0}; WEAK symbol NET_SendLoopPacket{0, 0x14041D780}; WEAK symbol NET_StringToAdr{0, 0x14041D870}; WEAK symbol NetadrToSockadr{0, 0x1404E53D0}; + WEAK symbol Omnvar_GetDef{0, 0x1404F3E80}; + WEAK symbol R_AddCmdDrawStretchPic{0x140234460, 0x140600BE0}; - WEAK symbol R_AddCmdDrawText{0x140533E40, 0x140601070}; - WEAK symbol R_AddCmdDrawTextWithCursor{0x140534170, 0x1406013A0}; + WEAK symbol R_AddCmdDrawText{0x140533E40, 0x140601070}; + WEAK symbol R_AddCmdDrawTextWithCursor{0x140534170, 0x1406013A0}; WEAK symbol R_RegisterFont{0x1405130B0, 0x1405DFAC0}; WEAK symbol R_SyncRenderThread{0x140535AF0, 0x140602D30}; WEAK symbol R_TextWidth{0x140513390, 0x1405DFDB0}; @@ -166,27 +191,27 @@ namespace game WEAK symbol GetEntityFieldValue{0x1403DC810, 0x140437860}; WEAK symbol Scr_AllocVector{0x1403D9AF0, 0x140434A10}; WEAK symbol Scr_GetString{0, 0x140439160}; - WEAK symbol Scr_AddInt{0x0, 0x140437E70}; - WEAK symbol Scr_AddString{0x0, 0x1404381D0}; - WEAK symbol Scr_GetInt{0x0, 0x140438E10}; + WEAK symbol Scr_AddInt{0, 0x140437E70}; + WEAK symbol Scr_AddString{0, 0x1404381D0}; + WEAK symbol Scr_GetInt{0, 0x140438E10}; WEAK symbol Scr_GetFloat{0, 0x140438D60}; WEAK symbol Scr_GetNumParam{0x1403DDF60, 0x140438EC0}; WEAK symbol Scr_ClearOutParams{0x1403DD500, 0x140438600}; WEAK symbol Scr_GetEntityIdRef{0x1403DBDC0, 0x140436E10}; - WEAK symbol Scr_AddEntityNum{0x0, 0x140437F60}; + WEAK symbol Scr_AddEntityNum{0, 0x140437F60}; WEAK symbol Scr_SetObjectField{0x140350E70, 0x1403D3FE0}; WEAK symbol Scr_NotifyId{0x1403DE730, 0x140439700}; - WEAK symbol Scr_NotifyLevel{0x0, 0x1404397D0}; - WEAK symbol Scr_GetEntityId{0x0, 0x140436D60}; - WEAK symbol Scr_CastString{0x0, 0x140434AC0}; + WEAK symbol Scr_NotifyLevel{0, 0x1404397D0}; + WEAK symbol Scr_GetEntityId{0, 0x140436D60}; + WEAK symbol Scr_CastString{0, 0x140434AC0}; WEAK symbol Scr_ExecThread{0x1403DD600, 0x1404386E0}; WEAK symbol Scr_LoadScript{0x1403D3C50, 0x14042EAA0}; WEAK symbol Scr_GetFunctionHandle{0x1403D3AD0 , 0x14042E920}; WEAK symbol Scr_RegisterFunction{0x1403D3530, 0x14042E330}; - WEAK symbol Scr_ErrorInternal{0x0, 0x140438660}; + WEAK symbol Scr_ErrorInternal{0, 0x140438660}; - WEAK symbol GetObjectType{0x0, 0x140433CF0}; + WEAK symbol GetObjectType{0, 0x140433CF0}; WEAK symbol VM_Execute{0, 0x14043A280}; @@ -201,7 +226,7 @@ namespace game WEAK symbol SV_Cmd_ArgvBuffer{0x1403B4560, 0x1403F80D0}; WEAK symbol SV_Cmd_TokenizeString{0, 0x1403F8150}; WEAK symbol SV_Cmd_EndTokenizedString{0, 0x1403F8110}; - WEAK symbol SV_MatchEnd{0x0, 0x14047A090}; + WEAK symbol SV_MatchEnd{0, 0x14047A090}; WEAK symbol SV_DirectConnect{0, 0x140471390}; WEAK symbol SV_GameSendServerCommand{0x140490F40, 0x1404758C0}; @@ -219,6 +244,7 @@ namespace game WEAK symbol SV_GetPlayerstateForClientNum{0x140490F80, 0x140475A10}; WEAK symbol SV_GetGuid{0, 0x140475990}; WEAK symbol SV_KickClientNum{0, 0x14046F730}; + WEAK symbol SV_Netchan_Transmit{0, 0x14047CC60}; WEAK symbol SV_SetConfigstring{0, 0x140477450}; WEAK symbol Sys_Error{0x14043AC20, 0x1404FF510}; @@ -237,6 +263,9 @@ namespace game WEAK symbol UI_LocalizeMapname{0, 0x1404B96D0}; WEAK symbol UI_LocalizeGametype{0, 0x1404B90F0}; + WEAK symbol VehicleCam_UpdatePlayerControlCam{0, 0x140568CA0}; + WEAK symbol dwGetLogOnStatus{0, 0x140589490}; WEAK symbol PM_trace{0, 0x140225DB0}; - WEAK symbol Jump_ClearState{0x0, 0x140213120}; + WEAK symbol Jump_ClearState{0, 0x140213120}; WEAK symbol longjmp{0x14062E030, 0x140738060}; WEAK symbol _setjmp{0x14062F030, 0x140739060}; @@ -294,9 +323,9 @@ namespace game WEAK symbol scr_function_stack{0x1455BE708, 0x144D57808}; WEAK symbol scr_levelEntityId{0x1452A9F30, 0x144A43020}; - WEAK symbol level_time{0x0, 0x1443F4B6C}; - WEAK symbol level_finished{0x0, 0x1443F6FAC}; - WEAK symbol level_savepersist{0x0, 0x1443F5710}; + WEAK symbol level_time{0, 0x1443F4B6C}; + WEAK symbol level_finished{0, 0x1443F6FAC}; + WEAK symbol level_savepersist{0, 0x1443F5710}; WEAK symbol threadIds{0x144DE6640, 0x1446B4960};