From 8991b557ab4ede8529e33498581d2d68f956fecb Mon Sep 17 00:00:00 2001 From: dysphie Date: Sun, 31 Oct 2021 22:42:45 -0300 Subject: [PATCH] Update gamedata for NMRiH 1.12 (#1623) * Fix NMRiH's sdktools gamedata * Fix NMRiH's sdkhooks gamedata * Fix GroundEntChanged linux offset --- gamedata/sdkhooks.games/game.nmrih.txt | 186 ++++++++++++------------- gamedata/sdktools.games/game.nmrih.txt | 94 ++++++------- 2 files changed, 140 insertions(+), 140 deletions(-) diff --git a/gamedata/sdkhooks.games/game.nmrih.txt b/gamedata/sdkhooks.games/game.nmrih.txt index 321847a6..91fa3b3c 100644 --- a/gamedata/sdkhooks.games/game.nmrih.txt +++ b/gamedata/sdkhooks.games/game.nmrih.txt @@ -5,142 +5,142 @@ "Offsets" { "Blocked" + { + "windows" "106" + "linux" "107" + "mac" "107" + } + "EndTouch" { "windows" "104" "linux" "105" "mac" "105" } - "EndTouch" - { - "windows" "102" - "linux" "103" - "mac" "103" - } "FireBullets" { - "windows" "114" - "linux" "115" - "mac" "115" + "windows" "116" + "linux" "117" + "mac" "117" } "GroundEntChanged" { - "windows" "179" - "linux" "181" - "mac" "181" + "windows" "181" + "linux" "183" + "mac" "183" } "OnTakeDamage" { - "windows" "62" - "linux" "63" - "mac" "63" + "windows" "64" + "linux" "65" + "mac" "65" } "OnTakeDamage_Alive" + { + "windows" "280" + "linux" "281" + "mac" "281" + } + "PreThink" + { + "windows" "352" + "linux" "353" + "mac" "353" + } + "PostThink" + { + "windows" "332" + "linux" "333" + "mac" "333" + } + "Reload" { "windows" "275" "linux" "276" "mac" "276" } - "PreThink" - { - "windows" "347" - "linux" "348" - "mac" "348" - } - "PostThink" - { - "windows" "327" - "linux" "328" - "mac" "328" - } - "Reload" - { - "windows" "272" - "linux" "273" - "mac" "273" - } "SetTransmit" - { - "windows" "20" - "linux" "21" - "mac" "21" - } - "ShouldCollide" - { - "windows" "16" - "linux" "17" - "mac" "17" - } - "Spawn" { "windows" "22" "linux" "23" "mac" "23" } + "ShouldCollide" + { + "windows" "17" + "linux" "18" + "mac" "18" + } + "Spawn" + { + "windows" "24" + "linux" "25" + "mac" "25" + } "StartTouch" + { + "windows" "102" + "linux" "103" + "mac" "103" + } + "Think" + { + "windows" "49" + "linux" "50" + "mac" "50" + } + "Touch" + { + "windows" "103" + "linux" "104" + "mac" "104" + } + "TraceAttack" + { + "windows" "62" + "linux" "63" + "mac" "63" + } + "Use" { "windows" "100" "linux" "101" "mac" "101" } - "Think" - { - "windows" "47" - "linux" "48" - "mac" "48" - } - "Touch" - { - "windows" "101" - "linux" "102" - "mac" "102" - } - "TraceAttack" - { - "windows" "60" - "linux" "61" - "mac" "61" - } - "Use" - { - "windows" "98" - "linux" "99" - "mac" "99" - } "VPhysicsUpdate" { - "windows" "159" - "linux" "160" - "mac" "160" + "windows" "161" + "linux" "162" + "mac" "162" } "Weapon_CanSwitchTo" + { + "windows" "274" + "linux" "275" + "mac" "275" + } + "Weapon_CanUse" + { + "windows" "268" + "linux" "269" + "mac" "269" + } + "Weapon_Drop" + { + "windows" "271" + "linux" "272" + "mac" "272" + } + "Weapon_Equip" { "windows" "269" "linux" "270" "mac" "270" } - "Weapon_CanUse" - { - "windows" "263" - "linux" "264" - "mac" "264" - } - "Weapon_Drop" - { - "windows" "266" - "linux" "267" - "mac" "267" - } - "Weapon_Equip" - { - "windows" "264" - "linux" "265" - "mac" "265" - } "Weapon_Switch" { - "windows" "267" - "linux" "268" - "mac" "268" + "windows" "272" + "linux" "273" + "mac" "273" } } } diff --git a/gamedata/sdktools.games/game.nmrih.txt b/gamedata/sdktools.games/game.nmrih.txt index 8419705d..0ce373b5 100644 --- a/gamedata/sdktools.games/game.nmrih.txt +++ b/gamedata/sdktools.games/game.nmrih.txt @@ -46,7 +46,7 @@ } } } - + /* CBaseEntityOutput::FireOutput */ "#default" { @@ -55,7 +55,7 @@ "FireOutput" { "library" "server" - "windows" "\x55\x8B\xEC\x81\xEC\x28\x01\x00\x00\xD9\x45\x24\x53\x8B\xD9\xC7\x45\xF0\x00\x00\x00\x00\x8B\x4D\x1C\x56\x57\x8B" + "windows" "\x55\x8B\xEC\x81\xEC\x28\x01\x00\x00\xD9\x45\x24\x53\x8B\xD9\xC7" "linux" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f" "mac" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f" } @@ -69,93 +69,93 @@ { "GiveNamedItem" { - "windows" "415" - "linux" "416" - "mac" "416" + "windows" "420" + "linux" "421" + "mac" "421" } "RemovePlayerItem" { - "windows" "273" - "linux" "274" - "mac" "274" + "windows" "278" + "linux" "279" + "mac" "279" } "Weapon_GetSlot" { - "windows" "271" - "linux" "272" - "mac" "272" + "windows" "276" + "linux" "277" + "mac" "277" } "Ignite" { - "windows" "211" - "linux" "212" - "mac" "212" + "windows" "214" + "linux" "215" + "mac" "215" } "Extinguish" { - "windows" "215" - "linux" "216" - "mac" "216" + "windows" "218" + "linux" "219" + "mac" "219" } "Teleport" { - "windows" "110" - "linux" "111" - "mac" "111" + "windows" "112" + "linux" "113" + "mac" "113" } "CommitSuicide" { - "windows" "454" - "linux" "454" - "mac" "454" + "windows" "459" + "linux" "460" + "mac" "460" } "GetVelocity" { - "windows" "142" - "linux" "143" - "mac" "143" + "windows" "144" + "linux" "145" + "mac" "145" } "EyeAngles" { - "windows" "133" - "linux" "134" - "mac" "134" + "windows" "135" + "linux" "136" + "mac" "136" } "AcceptInput" { - "windows" "36" - "linux" "37" - "mac" "37" + "windows" "38" + "linux" "39" + "mac" "39" } "SetEntityModel" { - "windows" "24" - "linux" "25" - "mac" "25" + "windows" "26" + "linux" "27" + "mac" "27" } "WeaponEquip" { - "windows" "264" - "linux" "265" - "mac" "265" + "windows" "269" + "linux" "270" + "mac" "270" } "Activate" { - "windows" "33" - "linux" "34" - "mac" "34" + "windows" "35" + "linux" "36" + "mac" "36" } "PlayerRunCmd" { - "windows" "433" - "linux" "434" - "mac" "434" + "windows" "438" + "linux" "439" + "mac" "439" } "GiveAmmo" { - "windows" "255" - "linux" "255" - "mac" "255" + "windows" "260" + "linux" "260" + "mac" "260" } } }