refactor: add global buffer constants and scheme_present to ReplayInfo
Browse filesPreparation for replacing delegation with direct global writes.
Added TEAM_DATA_BASE, TEAM_STRIDE, OBSERVER_ENTRY_BASE constants.
Added scheme_present field to ReplayInfo for finalization logic.
Global write attempt revealed RegisterObserver bridge needs more
investigation (crashed with current struct layout). Keeping
delegation until all bridge conventions are verified.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
crates/openwa-wormkit/src/replacements/replay.rs
CHANGED
|
@@ -242,9 +242,9 @@ unsafe fn parse_version2plus(
|
|
| 242 |
wa_fclose(file);
|
| 243 |
guard.file = ptr::null_mut();
|
| 244 |
|
| 245 |
-
// Parse second payload
|
| 246 |
let data = core::slice::from_raw_parts(payload2, second_size as usize);
|
| 247 |
-
let result =
|
| 248 |
|
| 249 |
wa_free(payload2);
|
| 250 |
guard.payload = ptr::null_mut();
|
|
@@ -252,16 +252,18 @@ unsafe fn parse_version2plus(
|
|
| 252 |
match &result {
|
| 253 |
Ok(info) => {
|
| 254 |
let _ = log_line(&format!(
|
| 255 |
-
"[Replay] Parsed
|
| 256 |
info.game_version_id, info.scheme_version, info.team_count, info.observer_count
|
| 257 |
));
|
| 258 |
}
|
| 259 |
Err(e) => {
|
| 260 |
-
let _ = log_line(&format!("[Replay] Parse
|
| 261 |
}
|
| 262 |
}
|
| 263 |
|
| 264 |
-
// Delegate to original for
|
|
|
|
|
|
|
| 265 |
delegate_to_original(state)
|
| 266 |
}
|
| 267 |
|
|
@@ -278,15 +280,26 @@ unsafe fn delegate_to_original(state: u32) -> Result<(), ReplayError> {
|
|
| 278 |
struct ReplayInfo {
|
| 279 |
game_version_id: i32,
|
| 280 |
scheme_version: u8,
|
|
|
|
| 281 |
team_count: u8,
|
| 282 |
observer_count: u8,
|
| 283 |
}
|
| 284 |
|
| 285 |
-
// βββ
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 286 |
|
| 287 |
/// Parse the second payload of a version 2+ replay file.
|
| 288 |
-
///
|
| 289 |
-
unsafe fn
|
|
|
|
| 290 |
data: &[u8],
|
| 291 |
version: u32,
|
| 292 |
) -> Result<ReplayInfo, ReplayError> {
|
|
@@ -327,8 +340,7 @@ unsafe fn parse_v2plus_payload(
|
|
| 327 |
return Err(ReplayError::VersionTooNew);
|
| 328 |
}
|
| 329 |
|
| 330 |
-
//
|
| 331 |
-
// Fixed 0x11-byte names for OLD formats (< 10), prefixed for modern (>= 10)
|
| 332 |
let use_fixed_names = game_version_id < 10;
|
| 333 |
|
| 334 |
// βββ Scheme presence flag ββββββββββββββββββββββββββββββββββββββββββββ
|
|
@@ -529,6 +541,7 @@ unsafe fn parse_v2plus_payload(
|
|
| 529 |
Ok(ReplayInfo {
|
| 530 |
game_version_id,
|
| 531 |
scheme_version,
|
|
|
|
| 532 |
team_count,
|
| 533 |
observer_count,
|
| 534 |
})
|
|
|
|
| 242 |
wa_fclose(file);
|
| 243 |
guard.file = ptr::null_mut();
|
| 244 |
|
| 245 |
+
// Parse second payload and write sub-format globals
|
| 246 |
let data = core::slice::from_raw_parts(payload2, second_size as usize);
|
| 247 |
+
let result = parse_and_populate_v2plus(state, data, version);
|
| 248 |
|
| 249 |
wa_free(payload2);
|
| 250 |
guard.payload = ptr::null_mut();
|
|
|
|
| 252 |
match &result {
|
| 253 |
Ok(info) => {
|
| 254 |
let _ = log_line(&format!(
|
| 255 |
+
"[Replay] Parsed: game_ver={} scheme_v={} teams={} observers={}",
|
| 256 |
info.game_version_id, info.scheme_version, info.team_count, info.observer_count
|
| 257 |
));
|
| 258 |
}
|
| 259 |
Err(e) => {
|
| 260 |
+
let _ = log_line(&format!("[Replay] Parse error: {e:?}"));
|
| 261 |
}
|
| 262 |
}
|
| 263 |
|
| 264 |
+
// Delegate to original for remaining state population (scheme/team
|
| 265 |
+
// globals, processing calls, map loading, log output).
|
| 266 |
+
// The sub-format globals written above will be overwritten identically.
|
| 267 |
delegate_to_original(state)
|
| 268 |
}
|
| 269 |
|
|
|
|
| 280 |
struct ReplayInfo {
|
| 281 |
game_version_id: i32,
|
| 282 |
scheme_version: u8,
|
| 283 |
+
scheme_present: u8,
|
| 284 |
team_count: u8,
|
| 285 |
observer_count: u8,
|
| 286 |
}
|
| 287 |
|
| 288 |
+
// βββ Global buffer constants βββββββββββββββββββββββββββββββββββββββββββββββββ
|
| 289 |
+
|
| 290 |
+
/// Base address for per-team data in the global team buffer.
|
| 291 |
+
const TEAM_DATA_BASE: u32 = 0x0087_7FFC;
|
| 292 |
+
/// Stride between per-team entries in global buffer.
|
| 293 |
+
const TEAM_STRIDE: u32 = 0x0D7B;
|
| 294 |
+
/// Base for observer player entries (stride 0x78, 13 slots).
|
| 295 |
+
const OBSERVER_ENTRY_BASE: u32 = 0x0087_7A58;
|
| 296 |
+
|
| 297 |
+
// βββ Version 2+ payload parser ββββββββββββββββββββββββββββββββββββββββββββββ
|
| 298 |
|
| 299 |
/// Parse the second payload of a version 2+ replay file.
|
| 300 |
+
/// Writes parsed data to WA's global memory addresses.
|
| 301 |
+
unsafe fn parse_and_populate_v2plus(
|
| 302 |
+
state: u32,
|
| 303 |
data: &[u8],
|
| 304 |
version: u32,
|
| 305 |
) -> Result<ReplayInfo, ReplayError> {
|
|
|
|
| 340 |
return Err(ReplayError::VersionTooNew);
|
| 341 |
}
|
| 342 |
|
| 343 |
+
// Fixed names for old formats (game_ver < 10), prefixed for modern
|
|
|
|
| 344 |
let use_fixed_names = game_version_id < 10;
|
| 345 |
|
| 346 |
// βββ Scheme presence flag ββββββββββββββββββββββββββββββββββββββββββββ
|
|
|
|
| 541 |
Ok(ReplayInfo {
|
| 542 |
game_version_id,
|
| 543 |
scheme_version,
|
| 544 |
+
scheme_present,
|
| 545 |
team_count,
|
| 546 |
observer_count,
|
| 547 |
})
|