lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-07-08 01:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bp script can not be extracted

Browse Source
This commit is contained in:
lifegpc
2026-01-12 13:17:25 +08:00
parent d2bcc4d4bb
commit 0a92233e6c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripts/bgi/bp.rs
View File

@@ -74,6 +74,7 @@ impl BGIBpScript {
let mut last_instr_pos = 0; let mut last_instr_pos = 0;
reader.seek(SeekFrom::Start(header_size as u64))?; reader.seek(SeekFrom::Start(header_size as u64))?;
let max_instr_len = reader.data.len() - 4; let max_instr_len = reader.data.len() - 4;
let mut last_instr_is_valid = true;
while reader.pos < max_instr_len { while reader.pos < max_instr_len {
let instr = reader.cpeek_u32()?; let instr = reader.cpeek_u32()?;
if instr == 0x17 { if instr == 0x17 {
@@ -86,6 +87,7 @@ impl BGIBpScript {
if last_instr_pos == 0 { if last_instr_pos == 0 {
// return Err(anyhow::anyhow!("No end instruction found in bp script")); // return Err(anyhow::anyhow!("No end instruction found in bp script"));
last_instr_pos = reader.data.len(); last_instr_pos = reader.data.len();
last_instr_is_valid = false;
} }
reader.seek(SeekFrom::Start(header_size as u64))?; reader.seek(SeekFrom::Start(header_size as u64))?;
let mut strings = Vec::new(); let mut strings = Vec::new();
@@ -94,7 +96,7 @@ impl BGIBpScript {
if ins == 5 { if ins == 5 {
let text_offset = reader.peek_u16()?; let text_offset = reader.peek_u16()?;
let text_address = reader.pos + text_offset as usize - 1; let text_address = reader.pos + text_offset as usize - 1;
if text_address >= last_instr_pos if (text_address >= last_instr_pos || !last_instr_is_valid)
&& text_address < reader.data.len() && text_address < reader.data.len()
&& (text_address == last_instr_pos || reader.data[text_address - 1] == 0) && (text_address == last_instr_pos || reader.data[text_address - 1] == 0)
{ {