preserve-emulation/gopher64
1
0
Fork 0
mirror of https://github.com/gopher64/gopher64.git synced 2026-07-11 01:25:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid panic with invalid cheat (#823)

Browse Source 
* avoid panic with invalid cheat

* more

* more
This commit is contained in:
Logan McNaughton
2026-05-02 17:59:51 +02:00
committed by GitHub
parent abacaddf8a
commit b865538d6e
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cheats.rs
+14 -7
View File
@@ -48,7 +48,8 @@ pub fn init(
{
option_value = Some(found_option_value.to_string());
} else {
panic!("Cheat option: {option} not found");
println!("Cheat option: {option} not found");
continue;
}
}
@@ -65,13 +66,19 @@ pub fn init(
}
let mut split = result.split_whitespace();
let first_part = u32::from_str_radix(split.next().unwrap(), 16).unwrap();
decoded_cheat.push(DecodedCheat {
code_type: (first_part >> 24) as u8,
address: first_part & 0x00FFFFFF,
data: u16::from_str_radix(split.next().unwrap(), 16).unwrap(),
});
if let Ok(data) = u16::from_str_radix(split.next().unwrap(), 16) {
decoded_cheat.push(DecodedCheat {
code_type: (first_part >> 24) as u8,
address: first_part & 0x00FFFFFF,
data,
})
} else {
println!("Could not parse data for: {}", cheat_setting.0);
};
}
if !decoded_cheat.is_empty() {
device.cheats.cheats.push(decoded_cheat);
}
device.cheats.cheats.push(decoded_cheat);
} else {
println!("Could not find cheat: {}", cheat_setting.0);
}