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

Remove unused var

Browse Source
This commit is contained in:
lifegpc
2025-05-21 08:34:54 +08:00
parent eb5aca95a4
commit 54cfb39786
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/scripts/circus/script.rs
View File

@@ -229,7 +229,6 @@ impl Script for CircusMesScript {
nmes.insert(0, m); nmes.insert(0, m);
} }
let mut mes = nmes.pop(); let mut mes = nmes.pop();
let mut s = None;
let mut block_count = 0; let mut block_count = 0;
for token in self.tokens.iter() { for token in self.tokens.iter() {
if !self.is_new_ver { if !self.is_new_ver {
@@ -247,18 +246,20 @@ impl Script for CircusMesScript {
return Err(anyhow::anyhow!("No more messages to import")); return Err(anyhow::anyhow!("No more messages to import"));
} }
} }
if token.value == self.info.nameopcode { let s = if token.value == self.info.nameopcode {
if mes.as_ref().unwrap().name.is_none() { match mes.as_mut().unwrap().name.take() {
s = Some(mes.as_ref().unwrap().message.clone()); Some(s) => s,
mes = None; None => {
} else { let t = mes.as_ref().unwrap().message.clone();
s = mes.as_mut().unwrap().name.take(); mes = None;
t
}
} }
} else { } else {
s = Some(mes.as_ref().unwrap().message.clone()); let t = mes.as_ref().unwrap().message.clone();
mes = None; mes = None;
} t
let s = s.take().ok_or(anyhow::anyhow!("No string found"))?; };
let mut text = encode_string(encoding, &s)?; let mut text = encode_string(encoding, &s)?;
buffer.push(token.value); buffer.push(token.value);
for t in text.iter_mut() { for t in text.iter_mut() {
@@ -275,19 +276,21 @@ impl Script for CircusMesScript {
return Err(anyhow::anyhow!("No more messages to import")); return Err(anyhow::anyhow!("No more messages to import"));
} }
} }
if token.value == self.info.nameopcode { let s = if token.value == self.info.nameopcode {
if mes.as_ref().unwrap().name.is_none() { match mes.as_mut().unwrap().name.take() {
s = Some(mes.as_ref().unwrap().message.clone()); Some(s) => s,
mes = None; None => {
} else { let t = mes.as_ref().unwrap().message.clone();
s = mes.as_mut().unwrap().name.take(); mes = None;
t
}
} }
} else { } else {
s = Some(mes.as_ref().unwrap().message.clone()); let t = mes.as_ref().unwrap().message.clone();
mes = None; mes = None;
} t
};
buffer.push(token.value); buffer.push(token.value);
let s = s.take().ok_or(anyhow::anyhow!("No string found"))?;
let text = encode_string(encoding, &s)?; let text = encode_string(encoding, &s)?;
buffer.extend_from_slice(&text); buffer.extend_from_slice(&text);
buffer.push(0x00); buffer.push(0x00);