Skip to content

Commit 4089f1e

Browse files
authored
Merge pull request #12 from rcnoob/main
8-14 fixes
2 parents 8c28ff7 + b0c342f commit 4089f1e

4 files changed

Lines changed: 22 additions & 22 deletions

File tree

AMBuilder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for sdk_target in MMSPlugin.sdk_targets:
1414
try:
1515
version = subprocess.check_output(['git', 'describe', '--tags', '--long']).decode('ascii').strip()
1616
except subprocess.SubprocessError as e:
17-
version = "1.8-dev"
17+
version = "1.9-dev"
1818
print("git describe failed as there are no tags")
1919

2020
print(f'Setting version to "{version}"')

gamedata/cs2fixes.games.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"TryPlayerMove"
1010
{
1111
"library" "server"
12-
"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"
13-
"linux" "\x55\x66\x0F\xEF\xC0\x48\x89\xE5\x41\x57\x49\x89\xF7\x41\x56\x41\x55\x49\x89\xD5"
12+
"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"
13+
"linux" "\x55\x66\x0F\xEF\xC0\x48\x89\xE5\x41\x57\x49\x89\xF7\x41\x56\x41\x55\x4D\x89\xC5"
1414
}
1515
//https://github.com/KZGlobalTeam/cs2kz-metamod/blob/f4ba43bd44dc3300bb78ca20006174935ba7964f/gamedata/cs2kz-core.games.txt#L217C4-L224C5
1616
// sub_18061AF90(a1, a2, ((a1 + 48) + 864i64) & 1); <- this one
@@ -94,8 +94,8 @@
9494
"CBaseEntity_TakeDamageOld"
9595
{
9696
"library" "server"
97-
"windows" "\x48\x89\x74\x24\x2A\x57\x48\x81\xEC\x2A\x2A\x2A\x2A\x48\x8B\x41\x2A\x48\x8B\xFA"
98-
"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"
97+
"windows" "\x4C\x8B\xDC\x56\x57\x48\x81\xEC\x2A\x2A\x2A\x2A\x48\x8B\x41"
98+
"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"
9999
}
100100
// "Game System %s is defined twice!\n"
101101
// Note that this signature points to the instruction with sm_pFirst which is the first qword referenced in the function.
@@ -130,7 +130,7 @@
130130
{
131131
"library" "server"
132132
"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"
133-
"linux" "\x55\x48\x8D\x15\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x55\x49\x89\xFD"
133+
"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"
134134
}
135135
"CreateEntityByName"
136136
{
@@ -191,7 +191,7 @@
191191
{
192192
"library" "server"
193193
"windows" "\x40\x57\x41\x57\x48\x81\xEC\x2A\x2A\x2A\x2A\x48\x83\x79"
194-
"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"
194+
"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"
195195
}
196196

197197
// "env_shake %s with...", in either xref there will be a call to SetMoveType(a1, 0, 0) at the top
@@ -205,7 +205,7 @@
205205
{
206206
"library" "server"
207207
"windows" "\x40\x53\x48\x83\xEC\x60\x48\xC7\x41\x38\xFF\xFF\xFF\xFF"
208-
"linux" "\x55\x48\x89\xE5\x48\x83\xEC\x10\x4C\x8D\x15\x2A\x2A\x2A\x2A"
208+
"linux" "\x49\xBB\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x55\x66\x0F\xEF\xC9\x48\x89\xE5"
209209
}
210210
"NetworkStateChanged"
211211
{
@@ -229,18 +229,18 @@
229229
}
230230
"CBaseEntity::Use"
231231
{
232-
"windows" "148"
233-
"linux" "147"
232+
"windows" "147"
233+
"linux" "146"
234234
}
235235
"Teleport"
236236
{
237-
"windows" "166"
238-
"linux" "165"
237+
"windows" "165"
238+
"linux" "164"
239239
}
240240
"CollisionRulesChanged"
241241
{
242-
"windows" "190"
243-
"linux" "189"
242+
"windows" "189"
243+
"linux" "188"
244244
}
245245
"IsEntityPawn"
246246
{
@@ -255,8 +255,8 @@
255255
// String: "%s<%i><%s><%s>" ChangeTeam() CTMDBG..."
256256
"CCSPlayerController_ChangeTeam"
257257
{
258-
"windows" "107"
259-
"linux" "106"
258+
"windows" "106"
259+
"linux" "105"
260260
}
261261
// Look for the kill command, go through its callback and you should a find call like this, with v9 being a pawn pointer:
262262
// return (*(*v9 + 2872LL))(v9, v27, 0LL);
@@ -279,13 +279,13 @@
279279
}
280280
"CCSPlayerController_Respawn"
281281
{
282-
"windows" "276"
283-
"linux" "278"
282+
"windows" "275"
283+
"linux" "277"
284284
}
285285
"GetHammerUniqueId"
286286
{
287-
"windows" "116"
288-
"linux" "115"
287+
"windows" "115"
288+
"linux" "114"
289289
}
290290
"CheckTransmitPlayerSlot"
291291
{

src/cs2fixes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ const char *CS2Fixes::GetLicense()
253253
const char *CS2Fixes::GetVersion()
254254
{
255255
#ifndef CS2FIXES_VERSION
256-
#define CS2FIXES_VERSION "1.8-dev"
256+
#define CS2FIXES_VERSION "1.9-dev"
257257
#endif
258258

259259
return CS2FIXES_VERSION; // defined by the build script

0 commit comments

Comments
 (0)