From c0580ef14a1f4da636de14222a6542ed4fe6da66 Mon Sep 17 00:00:00 2001 From: xensik Date: Sat, 6 Aug 2022 14:12:29 +0200 Subject: [PATCH] change float and default case dissasemble --- src/h1/xsk/disassembler.cpp | 21 +++++++++------------ src/h2/xsk/disassembler.cpp | 21 +++++++++------------ src/iw5/xsk/disassembler.cpp | 21 +++++++++------------ src/iw6/xsk/disassembler.cpp | 21 +++++++++------------ src/iw7/xsk/disassembler.cpp | 21 +++++++++------------ src/iw8/xsk/disassembler.cpp | 6 +++--- src/s1/xsk/disassembler.cpp | 21 +++++++++------------ src/s2/xsk/disassembler.cpp | 21 +++++++++------------ src/s4/xsk/disassembler.cpp | 21 +++++++++------------ 9 files changed, 75 insertions(+), 99 deletions(-) diff --git a/src/h1/xsk/disassembler.cpp b/src/h1/xsk/disassembler.cpp index 99baf7be..7081d7ba 100644 --- a/src/h1/xsk/disassembler.cpp +++ b/src/h1/xsk/disassembler.cpp @@ -168,15 +168,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -185,12 +182,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(8); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -376,7 +373,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -517,7 +514,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst) diff --git a/src/h2/xsk/disassembler.cpp b/src/h2/xsk/disassembler.cpp index 9de4f6d0..b54b5ab0 100644 --- a/src/h2/xsk/disassembler.cpp +++ b/src/h2/xsk/disassembler.cpp @@ -168,15 +168,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -185,12 +182,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(8); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -376,7 +373,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -517,7 +514,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst) diff --git a/src/iw5/xsk/disassembler.cpp b/src/iw5/xsk/disassembler.cpp index fc1abdd3..1a9623c8 100644 --- a/src/iw5/xsk/disassembler.cpp +++ b/src/iw5/xsk/disassembler.cpp @@ -167,15 +167,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -184,12 +181,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(4); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -375,7 +372,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -516,7 +513,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst) diff --git a/src/iw6/xsk/disassembler.cpp b/src/iw6/xsk/disassembler.cpp index f9edf1ec..0811a049 100644 --- a/src/iw6/xsk/disassembler.cpp +++ b/src/iw6/xsk/disassembler.cpp @@ -167,15 +167,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -184,12 +181,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(8); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -375,7 +372,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -516,7 +513,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst) diff --git a/src/iw7/xsk/disassembler.cpp b/src/iw7/xsk/disassembler.cpp index 10315d38..447537c9 100644 --- a/src/iw7/xsk/disassembler.cpp +++ b/src/iw7/xsk/disassembler.cpp @@ -167,15 +167,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -184,12 +181,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(8); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -375,7 +372,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -516,7 +513,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst) diff --git a/src/iw8/xsk/disassembler.cpp b/src/iw8/xsk/disassembler.cpp index 264009eb..dabfb0d0 100644 --- a/src/iw8/xsk/disassembler.cpp +++ b/src/iw8/xsk/disassembler.cpp @@ -183,9 +183,9 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: diff --git a/src/s1/xsk/disassembler.cpp b/src/s1/xsk/disassembler.cpp index 55a36ca4..bc8afe31 100644 --- a/src/s1/xsk/disassembler.cpp +++ b/src/s1/xsk/disassembler.cpp @@ -168,15 +168,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -185,12 +182,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(8); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -376,7 +373,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -517,7 +514,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst) diff --git a/src/s2/xsk/disassembler.cpp b/src/s2/xsk/disassembler.cpp index f338be00..dc4dff1e 100644 --- a/src/s2/xsk/disassembler.cpp +++ b/src/s2/xsk/disassembler.cpp @@ -169,15 +169,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -186,12 +183,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(8); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -377,7 +374,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -518,7 +515,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst) diff --git a/src/s4/xsk/disassembler.cpp b/src/s4/xsk/disassembler.cpp index d03d19a8..22dcc655 100644 --- a/src/s4/xsk/disassembler.cpp +++ b/src/s4/xsk/disassembler.cpp @@ -180,15 +180,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) inst->data.push_back(utils::string::va("%i", script_->read())); break; case opcode::OP_GetFloat: - { - const auto val = script_->read(); - inst->data.push_back(utils::string::va("%g%s", val, val == int(val) ? ".0" : "")); - } + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetVector: - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); - inst->data.push_back(utils::string::va("%g", script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); + inst->data.push_back(utils::string::float_string(script_->read())); break; case opcode::OP_GetString: case opcode::OP_GetIString: @@ -197,12 +194,12 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst) break; case opcode::OP_GetAnimation: script_->seek(8); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_GetAnimTree: script_->seek(1); - inst->data.push_back(utils::string::quote(stack_->read_c_string().data(), false)); + inst->data.push_back(utils::string::quote(stack_->read_c_string(), false)); break; case opcode::OP_waittillmatch: inst->data.push_back(utils::string::va("%i", script_->read())); @@ -428,7 +425,7 @@ void disassembler::disassemble_end_switch(const instruction::ptr& inst) else if (value == 0) { inst->data.push_back("default"); - stack_->read(); + stack_->read_c_string(); } else { @@ -582,7 +579,7 @@ void disassembler::print_function(const function::ptr& func) print_instruction(inst); } - output_->write_string(utils::string::va("end_%s\n", func->name.substr(4).data())); + output_->write_string(utils::string::va("end_%s\n", func->name.data())); } void disassembler::print_instruction(const instruction::ptr& inst)