From 31c89a099c7ea43663da695d3d9017d653ddf31d Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 20 Feb 2025 10:10:19 -0500 Subject: [PATCH] Add fixed gamedata from Anonymous Player (cherry picked from commit e24d49446742aecb42aceb635ce2f978e0b954f6) --- gamedata/sdkhooks.games/game.hl1mp.txt | 9 +- gamedata/sdktools.games/game.hl1mp.txt | 159 +++++++++---------------- 2 files changed, 63 insertions(+), 105 deletions(-) diff --git a/gamedata/sdkhooks.games/game.hl1mp.txt b/gamedata/sdkhooks.games/game.hl1mp.txt index 9eabf0cef..59b94f282 100644 --- a/gamedata/sdkhooks.games/game.hl1mp.txt +++ b/gamedata/sdkhooks.games/game.hl1mp.txt @@ -74,6 +74,7 @@ "linux" "340" "linux64" "340" } + /* CBaseCombatWeapon::Reload */ "Reload" { "windows" "276" @@ -97,10 +98,10 @@ } "Spawn" { - "windows" "29" - "windows64" "29" - "linux" "30" - "linux64" "30" + "windows" "24" + "windows64" "24" + "linux" "25" + "linux64" "25" } "StartTouch" { diff --git a/gamedata/sdktools.games/game.hl1mp.txt b/gamedata/sdktools.games/game.hl1mp.txt index 8f4241a41..3f37b5a10 100644 --- a/gamedata/sdktools.games/game.hl1mp.txt +++ b/gamedata/sdktools.games/game.hl1mp.txt @@ -11,73 +11,30 @@ "Games" { - /* General GameRules */ - "#default" - { - "Offsets" - { - /* Offset into CreateGameRulesObject */ - "g_pGameRules" - { - "windows" "5" - } - } - - "Signatures" - { - /* This signature sometimes has multiple matches, but this - * does not matter as g_pGameRules is involved in all of them. - * The same g_pGameRules offset applies to each match. - * - * Sometimes this block of bytes is at the beginning of the static - * CreateGameRulesObject function and sometimes it is in the middle - * of an entirely different function. This depends on the game. - */ - "CreateGameRulesObject" - { - "library" "server" - "windows" "\x55\x8B\xEC\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x2A\x8B\x01\x6A\x01" - } - "g_pGameRules" - { - "library" "server" - "linux" "@g_pGameRules" - } - } - } - - /* CBaseEntityOutput::FireOutput */ - "#default" + /* Half-Life Deathmatch: Source */ + "hl1mp" { "Signatures" { + /* string: (%0.2f) output: (%s,%s) -> (%s,%s,%.1f)(%s)\n */ "FireOutput" { "library" "server" "windows" "\x55\x8B\xEC\x81\xEC\x24\x01\x00\x00\x53\x8B\xC1" + "windows64" "\x48\x8B\xC4\x48\x89\x50\x2A\x48\x89\x48\x2A\x41\x54" "linux" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f" + "linux64" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f" } - } - } - - /* CBaseAnimating::LookupAttachment */ - "#default" - { - "Signatures" - { /* Windows: Called with string "vehicle_driver_eyes" as the second parameter */ "LookupAttachment" { "library" "server" "windows" "\x55\x8B\xEC\x56\x8B\xF1\x80\xBE\x2A\x2A\x2A\x2A\x00\x75\x2A\x83\xBE\x2A\x2A\x2A\x2A\x00\x75\x2A\xE8\x2A\x2A\x2A\x2A\x85\xC0\x74\x2A\x8B\xCE\xE8\x2A\x2A\x2A\x2A\x8B\x86\x2A\x2A\x2A\x2A\x85\xC0\x74\x2A\x83\x38\x00\x74\x2A\xFF\x75\x2A\x50\xE8\x2A\x2A\x2A\x2A\x83\xC4\x08\x40" + "windows64" "\x48\x89\x5C\x24\x2A\x57\x48\x83\xEC\x20\x80\xB9\x2A\x2A\x2A\x2A\x00\x48\x8B\xFA\x48\x8B\xD9\x75\x2A\x48\x83\xB9\x2A\x2A\x2A\x2A\x00\x75\x2A\xE8\x2A\x2A\x2A\x2A\x48\x85\xC0\x74\x2A\x48\x8B\xCB\xE8\x2A\x2A\x2A\x2A\x48\x8B\x8B\x2A\x2A\x2A\x2A\x48\x85\xC9\x74\x2A\x48\x83\x39\x00\x74\x2A\x48\x8B\xD7\xE8" "linux" "@_ZN14CBaseAnimating16LookupAttachmentEPKc" + "linux64" "@_ZN14CBaseAnimating16LookupAttachmentEPKc" } } - } - - /* Half-Life Deathmatch: Source */ - "hl1mp" - { "Offsets" { "SetOwnerEntity" @@ -89,66 +46,66 @@ } "GiveNamedItem" { - "windows" "412" - "windows64" "412" - "linux" "413" - "linux64" "413" + "windows" "407" + "windows64" "407" + "linux" "408" + "linux64" "408" } "RemovePlayerItem" { - "windows" "280" - "windows64" "280" - "linux" "281" - "linux64" "281" + "windows" "276" + "windows64" "276" + "linux" "277" + "linux64" "277" } "Weapon_GetSlot" { - "windows" "278" - "windows64" "278" - "linux" "279" - "linux64" "279" + "windows" "274" + "windows64" "274" + "linux" "275" + "linux64" "275" } "Ignite" + { + "windows" "215" + "windows64" "215" + "linux" "216" + "linux64" "216" + } + "Extinguish" { "windows" "219" "windows64" "219" "linux" "220" "linux64" "220" } - "Extinguish" - { - "windows" "223" - "windows64" "223" - "linux" "224" - "linux64" "224" - } "Teleport" { - "windows" "113" - "windows64" "113" - "linux" "114" - "linux64" "114" + "windows" "111" + "windows64" "111" + "linux" "110" + "linux64" "110" } "CommitSuicide" { - "windows" "453" - "windows64" "453" - "linux" "453" - "linux64" "453" + "windows" "446" + "windows64" "446" + "linux" "446" + "linux64" "446" } "GetVelocity" { - "windows" "146" - "windows64" "146" - "linux" "147" - "linux64" "147" + "windows" "143" + "windows64" "143" + "linux" "144" + "linux64" "144" } "EyeAngles" { - "windows" "137" - "windows64" "137" - "linux" "138" - "linux64" "138" + "windows" "134" + "windows64" "134" + "linux" "135" + "linux64" "135" } "SetEntityModel" { @@ -166,10 +123,10 @@ } "WeaponEquip" { - "windows" "271" - "windows64" "271" - "linux" "272" - "linux64" "272" + "windows" "268" + "windows64" "268" + "linux" "269" + "linux64" "269" } "Activate" { @@ -180,24 +137,24 @@ } "PlayerRunCmd" { - "windows" "430" - "windows64" "430" - "linux" "431" - "linux64" "431" + "windows" "425" + "windows64" "425" + "linux" "426" + "linux64" "426" } "GiveAmmo" { - "windows" "262" - "windows64" "262" - "linux" "263" - "linux64" "263" + "windows" "258" + "windows64" "258" + "linux" "259" + "linux64" "259" } "GetAttachment" { - "windows" "215" - "windows64" "215" - "linux" "216" - "linux64" "216" + "windows" "258" + "windows64" "258" + "linux" "259" + "linux64" "259" } }