phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-07 01:23:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(editor): preserve CreatureSpawn.id across JSON save/load

Browse source 
Quest links (questGiverNpcId, turnInNpcId, KillCreature targetName) all
key off CreatureSpawn.id, but loadFromFile always assigned new ids via
nextId(). So saving and reloading would silently break every quest hook
in the zone. Now JSON stores id, the loader reads it back when present
(legacy files fall back to nextId()), and idCounter_ is bumped past
loaded values to prevent future collisions. Same fix as the recent
PlacedObject.uniqueId one.
This commit is contained in:
Kelsi 2026-05-06 04:53:09 -07:00
parent 00717543a8
commit df1eed1c42
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/editor/npc_spawner.cpp
View file

@ -62,6 +62,7 @@ bool NpcSpawner::saveToFile(const std::string& path) const {
nlohmann::json arr = nlohmann::json::array();
for (const auto& s : spawns_) {
nlohmann::json js;
js["id"] = s.id;
js["name"] = s.name;
js["model"] = s.modelPath;
js["displayId"] = s.displayId;
@ -183,7 +184,16 @@ bool NpcSpawner::loadFromFile(const std::string& path) {
}
if (!s.name.empty()) {
s.id = nextId();
// Preserve original id from JSON if present so quest hooks
// (questGiverNpcId, turnInNpcId, KillCreature targetName)
// remain stable across save/load. Bump idCounter past any
// loaded value to avoid collisions with future placements.
if (js.contains("id")) {
s.id = js["id"].get<uint32_t>();
if (s.id >= idCounter_) idCounter_ = s.id + 1;
} else {
s.id = nextId();
}
spawns_.push_back(s);
}
}