Skip to content

Batched fix #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
486c merged 2 commits into from
Jan 23, 2026
Merged

Batched fix #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08bdd82
fix: use unwrap_unchecked() & warp it in unsafe block
486c Jan 23, 2026
a5dafca
fix: use batched reading for hit results in result screen state
486c Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 44 additions & 17 deletions src/reading_loop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,20 @@ pub fn process_gameplay(
)?;

// Safety: Already filled with zeros & bounds are correct
values.gameplay.hit_100 = i16::from_le_bytes(score_info_buff[0..2].try_into().unwrap());
values.gameplay.hit_300 = i16::from_le_bytes(score_info_buff[2..4].try_into().unwrap());
values.gameplay.hit_50 = i16::from_le_bytes(score_info_buff[4..6].try_into().unwrap());
values.gameplay.hit_geki = i16::from_le_bytes(score_info_buff[6..8].try_into().unwrap());
values.gameplay.hit_katu = i16::from_le_bytes(score_info_buff[8..10].try_into().unwrap());
values.gameplay.hit_miss = i16::from_le_bytes(score_info_buff[10..].try_into().unwrap());
unsafe {
values.gameplay.hit_100 =
i16::from_le_bytes(score_info_buff[0..2].try_into().unwrap_unchecked());
values.gameplay.hit_300 =
i16::from_le_bytes(score_info_buff[2..4].try_into().unwrap_unchecked());
values.gameplay.hit_50 =
i16::from_le_bytes(score_info_buff[4..6].try_into().unwrap_unchecked());
values.gameplay.hit_geki =
i16::from_le_bytes(score_info_buff[6..8].try_into().unwrap_unchecked());
values.gameplay.hit_katu =
i16::from_le_bytes(score_info_buff[8..10].try_into().unwrap_unchecked());
values.gameplay.hit_miss =
i16::from_le_bytes(score_info_buff[10..].try_into().unwrap_unchecked());
}

values.gameplay.username = p.read_string_with_limit_from_ptr(score_base + 0x28, 30)?;

Expand Down Expand Up @@ -192,13 +200,19 @@ pub fn process_reading_loop(p: &Process, state: &mut State) -> Result<()> {
&mut beatmap_stats_buff,
)?;

// Safety: unwrap here because buff is already initialized
// Safety: `buff` is already initialized
// and filled with zeros, the worst case scenario is
// ar, cs, od, hp going to be zero's
values.beatmap.ar = f32::from_le_bytes(beatmap_stats_buff[0..4].try_into().unwrap());
values.beatmap.cs = f32::from_le_bytes(beatmap_stats_buff[4..8].try_into().unwrap());
values.beatmap.hp = f32::from_le_bytes(beatmap_stats_buff[8..12].try_into().unwrap());
values.beatmap.od = f32::from_le_bytes(beatmap_stats_buff[12..].try_into().unwrap());
unsafe {
values.beatmap.ar =
f32::from_le_bytes(beatmap_stats_buff[0..4].try_into().unwrap_unchecked());
values.beatmap.cs =
f32::from_le_bytes(beatmap_stats_buff[4..8].try_into().unwrap_unchecked());
values.beatmap.hp =
f32::from_le_bytes(beatmap_stats_buff[8..12].try_into().unwrap_unchecked());
values.beatmap.od =
f32::from_le_bytes(beatmap_stats_buff[12..].try_into().unwrap_unchecked());
}

let plays_addr = p.read_i32(state.addresses.base - 0x33)? + 0xC;
values.plays = p.read_i32(plays_addr)?;
Expand Down Expand Up @@ -335,12 +349,25 @@ pub fn process_reading_loop(p: &Process, state: &mut State) -> Result<()> {
values.result_screen.mode = p.read_i32(result_base + 0x64)? as u8;
values.result_screen.score = p.read_i32(result_base + 0x78)?;

// TODO batch
values.result_screen.hit_300 = p.read_i16(result_base + 0x8A)?;
values.result_screen.hit_100 = p.read_i16(result_base + 0x88)?;
values.result_screen.hit_50 = p.read_i16(result_base + 0x8C)?;
values.result_screen.hit_geki = p.read_i16(result_base + 0x8E)?;
values.result_screen.hit_katu = p.read_i16(result_base + 0x90)?;
let mut info_buff = [0u8; size_of::<i16>() * 6];

p.read(result_base + 0x88, size_of::<i16>() * 6, &mut info_buff)?;

// Safety: Already filled with zeros & bounds are correct
unsafe {
values.result_screen.hit_100 =
i16::from_le_bytes(info_buff[0..2].try_into().unwrap_unchecked());
values.result_screen.hit_300 =
i16::from_le_bytes(info_buff[2..4].try_into().unwrap_unchecked());
values.result_screen.hit_50 =
i16::from_le_bytes(info_buff[4..6].try_into().unwrap_unchecked());
values.result_screen.hit_geki =
i16::from_le_bytes(info_buff[6..8].try_into().unwrap_unchecked());
values.result_screen.hit_katu =
i16::from_le_bytes(info_buff[8..10].try_into().unwrap_unchecked());
values.result_screen.hit_miss =
i16::from_le_bytes(info_buff[10..].try_into().unwrap_unchecked());
}

values.result_screen.update_accuracy();
}
Expand Down