From 298f5c11c40b148bd3feb8bb8a026218467bd94f Mon Sep 17 00:00:00 2001 From: rcnoob Date: Fri, 15 Aug 2025 22:21:15 -0400 Subject: [PATCH 1/4] 8-14 fixes updated sigs and sdk --- gamedata/cs2fixes.games.txt | 32 ++++++++++++++++---------------- sdk | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gamedata/cs2fixes.games.txt b/gamedata/cs2fixes.games.txt index 4a9a53c2..f3125f2f 100644 --- a/gamedata/cs2fixes.games.txt +++ b/gamedata/cs2fixes.games.txt @@ -94,8 +94,8 @@ "CBaseEntity_TakeDamageOld" { "library" "server" - "windows" "\x48\x89\x74\x24\x2A\x57\x48\x81\xEC\x2A\x2A\x2A\x2A\x48\x8B\x41\x2A\x48\x8B\xFA" - "linux" "\x55\x48\x89\xE5\x41\x57\x49\x89\xF7\x41\x56\x41\x55\x41\x54\x53\x48\x89\xFB\x48\x81\xEC\x2A\x2A\x2A\x2A\xF6\x46" + "windows" "\x4C\x8B\xDC\x56\x57\x48\x81\xEC\x2A\x2A\x2A\x2A\x48\x8B\x41" + "linux" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x89\xFB\x48\x81\xEC\x2A\x2A\x2A\x2A\x4C\x8D\x25\x2A\x2A\x2A\x2A\x49\x8B\x3C\x24" } // "Game System %s is defined twice!\n" // Note that this signature points to the instruction with sm_pFirst which is the first qword referenced in the function. @@ -191,7 +191,7 @@ { "library" "server" "windows" "\x40\x57\x41\x57\x48\x81\xEC\x2A\x2A\x2A\x2A\x48\x83\x79" - "linux" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x49\x89\xF4\x53\x48\x89\xFB\x48\x83\xEC\x2A\x48\x8B\x7F\x2A\x48\x85\xFF\x0F\x84" + "linux" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x49\x89\xF4\x53\x48\x89\xFB\x48\x83\xEC\x2A\x48\x8B\x7F\x2A\x48\x85\xFF\x0F\x84\x2A\x2A\x2A\x2A\x8B\x8F" } // "env_shake %s with...", in either xref there will be a call to SetMoveType(a1, 0, 0) at the top @@ -205,7 +205,7 @@ { "library" "server" "windows" "\x40\x53\x48\x83\xEC\x60\x48\xC7\x41\x38\xFF\xFF\xFF\xFF" - "linux" "\x55\x48\x89\xE5\x48\x83\xEC\x10\x4C\x8D\x15\x2A\x2A\x2A\x2A" + "linux" "\x49\xBB\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x55\x66\x0F\xEF\xC9\x48\x89\xE5" } "NetworkStateChanged" { @@ -229,18 +229,18 @@ } "CBaseEntity::Use" { - "windows" "148" - "linux" "147" + "windows" "147" + "linux" "146" } "Teleport" { - "windows" "166" - "linux" "165" + "windows" "165" + "linux" "164" } "CollisionRulesChanged" { - "windows" "190" - "linux" "189" + "windows" "189" + "linux" "188" } "IsEntityPawn" { @@ -255,8 +255,8 @@ // String: "%s<%i><%s><%s>" ChangeTeam() CTMDBG..." "CCSPlayerController_ChangeTeam" { - "windows" "107" - "linux" "106" + "windows" "106" + "linux" "105" } // Look for the kill command, go through its callback and you should a find call like this, with v9 being a pawn pointer: // return (*(*v9 + 2872LL))(v9, v27, 0LL); @@ -279,13 +279,13 @@ } "CCSPlayerController_Respawn" { - "windows" "276" - "linux" "278" + "windows" "275" + "linux" "277" } "GetHammerUniqueId" { - "windows" "116" - "linux" "115" + "windows" "115" + "linux" "114" } "CheckTransmitPlayerSlot" { diff --git a/sdk b/sdk index 510a1e4e..93ccb6b7 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 510a1e4e837461a8a30591667def9321179c0dad +Subproject commit 93ccb6b7b2ba8e4fcaca224ce21badbe35491280 From 4524a7fc7f7bddde93215f19906093d7757f0ae9 Mon Sep 17 00:00:00 2001 From: rcnoob Date: Fri, 15 Aug 2025 22:24:00 -0400 Subject: [PATCH 2/4] merge fork and update version --- AMBuilder | 2 +- src/cs2fixes.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AMBuilder b/AMBuilder index dfdb5606..fd66c1ec 100644 --- a/AMBuilder +++ b/AMBuilder @@ -14,7 +14,7 @@ for sdk_target in MMSPlugin.sdk_targets: try: version = subprocess.check_output(['git', 'describe', '--tags', '--long']).decode('ascii').strip() except subprocess.SubprocessError as e: - version = "1.8-dev" + version = "1.9-dev" print("git describe failed as there are no tags") print(f'Setting version to "{version}"') diff --git a/src/cs2fixes.cpp b/src/cs2fixes.cpp index 2cc6848b..c6e46972 100644 --- a/src/cs2fixes.cpp +++ b/src/cs2fixes.cpp @@ -253,7 +253,7 @@ const char *CS2Fixes::GetLicense() const char *CS2Fixes::GetVersion() { #ifndef CS2FIXES_VERSION -#define CS2FIXES_VERSION "1.8-dev" +#define CS2FIXES_VERSION "1.9-dev" #endif return CS2FIXES_VERSION; // defined by the build script From fda2504ca36287b651d1cfd02804f50a27113e2a Mon Sep 17 00:00:00 2001 From: rcnoob Date: Fri, 15 Aug 2025 22:37:09 -0400 Subject: [PATCH 3/4] Update cs2fixes.games.txt forgor signature --- gamedata/cs2fixes.games.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamedata/cs2fixes.games.txt b/gamedata/cs2fixes.games.txt index f3125f2f..a0cdd2cb 100644 --- a/gamedata/cs2fixes.games.txt +++ b/gamedata/cs2fixes.games.txt @@ -130,7 +130,7 @@ { "library" "server" "windows" "\x48\x89\x5C\x24\x2A\x48\x89\x6C\x24\x2A\x56\x57\x41\x56\x48\x83\xEC\x2A\x48\x8B\x01\x48\x8B\xFA" - "linux" "\x55\x48\x8D\x15\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x55\x49\x89\xFD" + "linux" "\x55\x48\x8D\x15\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x55\x41\x54\x49\x89\xFC\x53\x48\x89\xF3\x48\x83\xEC\x2A\x48\x8B\x07\x48\x8B\x80" } "CreateEntityByName" { From b0c342f65f5ddad255029611e9c7de2bdb07e8e0 Mon Sep 17 00:00:00 2001 From: rcnoob Date: Fri, 15 Aug 2025 22:44:56 -0400 Subject: [PATCH 4/4] update tryplayermove --- gamedata/cs2fixes.games.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gamedata/cs2fixes.games.txt b/gamedata/cs2fixes.games.txt index a0cdd2cb..011466ef 100644 --- a/gamedata/cs2fixes.games.txt +++ b/gamedata/cs2fixes.games.txt @@ -9,8 +9,8 @@ "TryPlayerMove" { "library" "server" - "windows" "\x48\x8B\xC4\x4C\x89\x48\x20\x4C\x89\x40\x18\x48\x89\x50\x10\x48\x89\x48\x08\x55\x53\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\xA8\x98\xFC\xFF\xFF" - "linux" "\x55\x66\x0F\xEF\xC0\x48\x89\xE5\x41\x57\x49\x89\xF7\x41\x56\x41\x55\x49\x89\xD5" + "windows" "\x48\x8B\xC4\x4C\x89\x48\x20\x4C\x89\x40\x18\x48\x89\x50\x10\x48\x89\x48\x08\x55\x53\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\xA8\xC8\xFD\xFF\xFF" + "linux" "\x55\x66\x0F\xEF\xC0\x48\x89\xE5\x41\x57\x49\x89\xF7\x41\x56\x41\x55\x4D\x89\xC5" } //https://github.com/KZGlobalTeam/cs2kz-metamod/blob/f4ba43bd44dc3300bb78ca20006174935ba7964f/gamedata/cs2kz-core.games.txt#L217C4-L224C5 // sub_18061AF90(a1, a2, ((a1 + 48) + 864i64) & 1); <- this one