diff --git a/output/offsets.cs b/output/offsets.cs index 604f363..4e636be 100644 --- a/output/offsets.cs +++ b/output/offsets.cs @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-05-23 23:09:24.161043 UTC +// 2024-05-24 00:18:41.177102700 UTC namespace CS2Dumper.Offsets { // Module: client.dll @@ -27,9 +27,12 @@ namespace CS2Dumper.Offsets { public const nint dwBuildNumber = 0x51E784; public const nint dwEngineViewData = 0x5DA9DC; public const nint dwNetworkGameClient = 0x51DB58; + public const nint dwNetworkGameClient_clientTickCount = 0x178; public const nint dwNetworkGameClient_deltaTick = 0x278; - public const nint dwNetworkGameClient_getLocalPlayer = 0xF0; - public const nint dwNetworkGameClient_getMaxClients = 0x270; + public const nint dwNetworkGameClient_isBackgroundMap = 0x28145F; + public const nint dwNetworkGameClient_localPlayer = 0xF0; + public const nint dwNetworkGameClient_maxClients = 0x270; + public const nint dwNetworkGameClient_serverTickCount = 0x174; public const nint dwNetworkGameClient_signOnState = 0x260; public const nint dwSoundService = 0x5DA940; public const nint dwWindowHeight = 0x5DE2B4; diff --git a/output/offsets.hpp b/output/offsets.hpp index 56c6e10..2c376da 100644 --- a/output/offsets.hpp +++ b/output/offsets.hpp @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-05-23 23:09:24.161043 UTC +// 2024-05-24 00:18:41.177102700 UTC #pragma once @@ -32,9 +32,12 @@ namespace cs2_dumper { constexpr std::ptrdiff_t dwBuildNumber = 0x51E784; constexpr std::ptrdiff_t dwEngineViewData = 0x5DA9DC; constexpr std::ptrdiff_t dwNetworkGameClient = 0x51DB58; + constexpr std::ptrdiff_t dwNetworkGameClient_clientTickCount = 0x178; constexpr std::ptrdiff_t dwNetworkGameClient_deltaTick = 0x278; - constexpr std::ptrdiff_t dwNetworkGameClient_getLocalPlayer = 0xF0; - constexpr std::ptrdiff_t dwNetworkGameClient_getMaxClients = 0x270; + constexpr std::ptrdiff_t dwNetworkGameClient_isBackgroundMap = 0x28145F; + constexpr std::ptrdiff_t dwNetworkGameClient_localPlayer = 0xF0; + constexpr std::ptrdiff_t dwNetworkGameClient_maxClients = 0x270; + constexpr std::ptrdiff_t dwNetworkGameClient_serverTickCount = 0x174; constexpr std::ptrdiff_t dwNetworkGameClient_signOnState = 0x260; constexpr std::ptrdiff_t dwSoundService = 0x5DA940; constexpr std::ptrdiff_t dwWindowHeight = 0x5DE2B4; diff --git a/output/offsets.json b/output/offsets.json index 6d01fef..b0d08a0 100644 --- a/output/offsets.json +++ b/output/offsets.json @@ -22,9 +22,12 @@ "dwBuildNumber": 5367684, "dwEngineViewData": 6138332, "dwNetworkGameClient": 5364568, + "dwNetworkGameClient_clientTickCount": 376, "dwNetworkGameClient_deltaTick": 632, - "dwNetworkGameClient_getLocalPlayer": 240, - "dwNetworkGameClient_getMaxClients": 624, + "dwNetworkGameClient_isBackgroundMap": 2626655, + "dwNetworkGameClient_localPlayer": 240, + "dwNetworkGameClient_maxClients": 624, + "dwNetworkGameClient_serverTickCount": 372, "dwNetworkGameClient_signOnState": 608, "dwSoundService": 6138176, "dwWindowHeight": 6152884, diff --git a/output/offsets.rs b/output/offsets.rs index e3ecc16..863094d 100644 --- a/output/offsets.rs +++ b/output/offsets.rs @@ -1,5 +1,5 @@ // Generated using https://github.com/a2x/cs2-dumper -// 2024-05-23 23:09:24.161043 UTC +// 2024-05-24 00:18:41.177102700 UTC #![allow(non_upper_case_globals, unused)] @@ -30,9 +30,12 @@ pub mod cs2_dumper { pub const dwBuildNumber: usize = 0x51E784; pub const dwEngineViewData: usize = 0x5DA9DC; pub const dwNetworkGameClient: usize = 0x51DB58; + pub const dwNetworkGameClient_clientTickCount: usize = 0x178; pub const dwNetworkGameClient_deltaTick: usize = 0x278; - pub const dwNetworkGameClient_getLocalPlayer: usize = 0xF0; - pub const dwNetworkGameClient_getMaxClients: usize = 0x270; + pub const dwNetworkGameClient_isBackgroundMap: usize = 0x28145F; + pub const dwNetworkGameClient_localPlayer: usize = 0xF0; + pub const dwNetworkGameClient_maxClients: usize = 0x270; + pub const dwNetworkGameClient_serverTickCount: usize = 0x174; pub const dwNetworkGameClient_signOnState: usize = 0x260; pub const dwSoundService: usize = 0x5DA940; pub const dwWindowHeight: usize = 0x5DE2B4; diff --git a/src/analysis/offsets.rs b/src/analysis/offsets.rs index 0d62b07..fb4a8e6 100644 --- a/src/analysis/offsets.rs +++ b/src/analysis/offsets.rs @@ -76,7 +76,7 @@ pattern_map! { let mut save = [0; 2]; if view.scanner().finds_code(pattern!("f2410f108430u4"), &mut save) { - map.insert("dwViewAngles".to_string(), rva + save[1]); // 0x5418); + map.insert("dwViewAngles".to_string(), rva + save[1]); } }), "dwEntityList" => pattern!("488935${'} 4885f6") => None, @@ -99,20 +99,23 @@ pattern_map! { engine2 => { "dwBuildNumber" => pattern!("8905${'} 488d0d${} ff15${}") => None, "dwNetworkGameClient" => pattern!("48893d${'} 488d15") => None, + "dwNetworkGameClient_clientTickCount" => pattern!("8b81u4 c3 cccccccccccccccccc 8b81${} c3 cccccccccccccccccc 83b9") => None, "dwNetworkGameClient_deltaTick" => pattern!("8983u4 40b7") => None, - "dwNetworkGameClient_getLocalPlayer" => pattern!("4883c0u1 488d0440 8b0cc1") => Some(|_view, map, rva| { + "dwNetworkGameClient_isBackgroundMap" => pattern!("0fb681u4 c3 cccccccccccccccc 0fb681${} c3 cccccccccccccccc 48895c24") => None, + "dwNetworkGameClient_localPlayer" => pattern!("4883c0u1 488d0440 8b0cc1") => Some(|_view, map, rva| { // .text 48 83 C0 0A | add rax, 0Ah // .text 48 8D 04 40 | lea rax, [rax + rax * 2] - // .text 45 8B 04 C7 | mov r8d, [r15 + rax * 8] - map.insert("dwNetworkGameClient_getLocalPlayer".to_string(), (rva + (rva * 2)) * 8); + // .text 8B 0C C1 | mov ecx, [rcx + rax * 8] + map.insert("dwNetworkGameClient_localPlayer".to_string(), (rva + (rva * 2)) * 8); }), - "dwNetworkGameClient_getMaxClients" => pattern!("8b81u2?? c3cccccccccccccccccc 8b81${} ffc0") => None, - "dwNetworkGameClient_signOnState" => pattern!("448b81u2?? 488d0d") => None, - "dwWindowHeight" => pattern!("8b05${'} 8903") => None, - "dwWindowWidth" => pattern!("8b05${'} 8907") => None, + "dwNetworkGameClient_maxClients" => pattern!("8b81u4 c3cccccccccccccccccc 8b81${} ffc0") => None, + "dwNetworkGameClient_serverTickCount" => pattern!("8b81u4 c3 cccccccccccccccccc 83b9") => None, + "dwNetworkGameClient_signOnState" => pattern!("448b81u4 488d0d") => None, "dwSoundService" => pattern!("488905${'} 4c8d4424? 488d05") => Some(|_view, map, rva| { map.insert("dwEngineViewData".to_string(), rva + 0x9C); }), + "dwWindowHeight" => pattern!("8b05${'} 8903") => None, + "dwWindowWidth" => pattern!("8b05${'} 8907") => None, }, input_system => { "dwInputSystem" => pattern!("488905${'} 488d05") => None,