incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix edge case in quest episode detection

Browse Source
This commit is contained in:
Martin Michelsen
2024-06-22 15:22:52 -07:00
parent 9ca1b79409
commit a88795d8b9
1 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/QuestScript.cc
+85 -81
View File
@@ -1667,100 +1667,104 @@ Episode find_quest_episode_from_script(const void* data, size_t size, Version ve
throw logic_error("invalid quest version"); throw logic_error("invalid quest version");
} }
const auto& opcodes = opcodes_for_version(version);
unordered_set<Episode> found_episodes; unordered_set<Episode> found_episodes;
// The set_episode opcode should always be in the first function (0) try {
StringReader cmd_r = r.sub(code_offset + r.pget_u32l(function_table_offset)); const auto& opcodes = opcodes_for_version(version);
// The set_episode opcode should always be in the first function (0)
StringReader cmd_r = r.sub(code_offset + r.pget_u32l(function_table_offset));
while (!cmd_r.eof()) { while (!cmd_r.eof()) {
uint16_t opcode = cmd_r.get_u8(); uint16_t opcode = cmd_r.get_u8();
if ((opcode & 0xFE) == 0xF8) { if ((opcode & 0xFE) == 0xF8) {
opcode = (opcode << 8) | cmd_r.get_u8(); opcode = (opcode << 8) | cmd_r.get_u8();
} }
const QuestScriptOpcodeDefinition* def = nullptr; const QuestScriptOpcodeDefinition* def = nullptr;
try { try {
def = opcodes.at(opcode); def = opcodes.at(opcode);
} catch (const out_of_range&) { } catch (const out_of_range&) {
} }
if (def == nullptr) { if (def == nullptr) {
throw runtime_error(string_printf("unknown quest opcode %04hX", opcode)); throw runtime_error(string_printf("unknown quest opcode %04hX", opcode));
} }
if (def->flags & F_RET) { if (def->flags & F_RET) {
break; break;
} }
if (!(def->flags & F_ARGS)) { if (!(def->flags & F_ARGS)) {
for (const auto& arg : def->args) { for (const auto& arg : def->args) {
using Type = QuestScriptOpcodeDefinition::Argument::Type; using Type = QuestScriptOpcodeDefinition::Argument::Type;
string dasm_arg; string dasm_arg;
switch (arg.type) { switch (arg.type) {
case Type::LABEL16: case Type::LABEL16:
cmd_r.skip(2); cmd_r.skip(2);
break; break;
case Type::LABEL32: case Type::LABEL32:
cmd_r.skip(4);
break;
case Type::LABEL16_SET:
if (def->flags & F_PASS) {
throw logic_error("LABEL16_SET cannot be pushed to arg stack");
}
cmd_r.skip(cmd_r.get_u8() * 2);
break;
case Type::REG:
cmd_r.skip(1);
break;
case Type::REG_SET:
if (def->flags & F_PASS) {
throw logic_error("REG_SET cannot be pushed to arg stack");
}
cmd_r.skip(cmd_r.get_u8());
break;
case Type::REG_SET_FIXED:
if (def->flags & F_PASS) {
throw logic_error("REG_SET_FIXED cannot be pushed to arg stack");
}
cmd_r.skip(1);
break;
case Type::REG32_SET_FIXED:
if (def->flags & F_PASS) {
throw logic_error("REG32_SET_FIXED cannot be pushed to arg stack");
}
cmd_r.skip(4);
break;
case Type::INT8:
cmd_r.skip(1);
break;
case Type::INT16:
cmd_r.skip(2);
break;
case Type::INT32:
if (def->flags & F_SET_EPISODE) {
found_episodes.emplace(episode_for_quest_episode_number(cmd_r.get_u32l()));
} else {
cmd_r.skip(4); cmd_r.skip(4);
} break;
break; case Type::LABEL16_SET:
case Type::FLOAT32: if (def->flags & F_PASS) {
cmd_r.skip(4); throw logic_error("LABEL16_SET cannot be pushed to arg stack");
break;
case Type::CSTRING:
if (use_wstrs) {
for (uint16_t ch = cmd_r.get_u16l(); ch; ch = cmd_r.get_u16l()) {
} }
} else { cmd_r.skip(cmd_r.get_u8() * 2);
for (uint8_t ch = cmd_r.get_u8(); ch; ch = cmd_r.get_u8()) { break;
case Type::REG:
cmd_r.skip(1);
break;
case Type::REG_SET:
if (def->flags & F_PASS) {
throw logic_error("REG_SET cannot be pushed to arg stack");
} }
} cmd_r.skip(cmd_r.get_u8());
break; break;
default: case Type::REG_SET_FIXED:
throw logic_error("invalid argument type"); if (def->flags & F_PASS) {
throw logic_error("REG_SET_FIXED cannot be pushed to arg stack");
}
cmd_r.skip(1);
break;
case Type::REG32_SET_FIXED:
if (def->flags & F_PASS) {
throw logic_error("REG32_SET_FIXED cannot be pushed to arg stack");
}
cmd_r.skip(4);
break;
case Type::INT8:
cmd_r.skip(1);
break;
case Type::INT16:
cmd_r.skip(2);
break;
case Type::INT32:
if (def->flags & F_SET_EPISODE) {
found_episodes.emplace(episode_for_quest_episode_number(cmd_r.get_u32l()));
} else {
cmd_r.skip(4);
}
break;
case Type::FLOAT32:
cmd_r.skip(4);
break;
case Type::CSTRING:
if (use_wstrs) {
for (uint16_t ch = cmd_r.get_u16l(); ch; ch = cmd_r.get_u16l()) {
}
} else {
for (uint8_t ch = cmd_r.get_u8(); ch; ch = cmd_r.get_u8()) {
}
}
break;
default:
throw logic_error("invalid argument type");
}
} }
} }
} }
} catch (const exception& e) {
log_warning("Cannot determine episode from quest script (%s)", e.what());
} }
if (found_episodes.size() > 1) { if (found_episodes.size() > 1) {