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

ignore map_designate, etc. if floor number isn't valid

Browse Source
This commit is contained in:
Martin Michelsen
2025-11-06 21:13:11 -08:00
parent 7210441878
commit c878093c5f
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/QuestScript.cc
+23 -5
View File
@@ -5045,10 +5045,23 @@ void populate_quest_metadata_from_script(
break; break;
} }
case 0x00C4: { // map_designate
uint32_t floor = regs.get(r.get_u8());
if (floor < meta.area_for_floor.size()) {
meta.area_for_floor[floor] = floor;
}
// phosg::fwrite_fmt(stderr, ">>> Trace: map_designate fa[{}]={}\n", floor, floor);
break;
}
case 0xF80D: { // map_designate_ex case 0xF80D: { // map_designate_ex
uint8_t base_reg = r.get_u8(); uint8_t base_reg = r.get_u8();
meta.area_for_floor.at(regs.get(base_reg)) = regs.get(base_reg + 1); uint32_t floor = regs.get(base_reg);
// phosg::fwrite_fmt(stderr, ">>> Trace: map_designate_ex fa[{}]={}\n", regs.get(base_reg), regs.get(base_reg + 1)); uint32_t area = regs.get(base_reg + 1);
if (floor < meta.area_for_floor.size()) {
meta.area_for_floor[floor] = area;
}
// phosg::fwrite_fmt(stderr, ">>> Trace: map_designate_ex fa[{}]={}\n", floor, area);
break; break;
} }
@@ -5291,9 +5304,14 @@ void populate_quest_metadata_from_script(
case 0xF951: { // bb_map_designate case 0xF951: { // bb_map_designate
uint8_t floor = r.get_u8(); uint8_t floor = r.get_u8();
meta.area_for_floor.at(floor) = r.get_u8(); if (floor < meta.area_for_floor.size()) {
r.skip(3); // entities_list_type, vars.layout, vars.entities meta.area_for_floor.at(floor) = r.get_u8();
// phosg::fwrite_fmt(stderr, ">>> Trace: bb_map_designate fa[{}]={}\n", floor, meta.area_for_floor.at(floor)); r.skip(3); // entities_list_type, vars.layout, vars.entities
// phosg::fwrite_fmt(stderr, ">>> Trace: bb_map_designate fa[{}]={}\n", floor, meta.area_for_floor.at(floor));
} else {
r.skip(4); // area, entities_list_type, vars.layout, vars.entities
// phosg::fwrite_fmt(stderr, ">>> Trace: bb_map_designate fa[{}]=(ignored)\n", floor);
}
break; break;
} }