Take 2 at fixing encounters

This commit is contained in:
Michael Cook (mackal) 2017-03-18 14:11:30 -04:00
parent bafb199d24
commit f64e1644b1
2 changed files with 3 additions and 1 deletions

View File

@ -2421,7 +2421,6 @@ void EntityList::Clear()
entity_list.RemoveAllDoors(); entity_list.RemoveAllDoors();
entity_list.RemoveAllObjects(); entity_list.RemoveAllObjects();
entity_list.RemoveAllRaids(); entity_list.RemoveAllRaids();
entity_list.RemoveAllEncounters();
entity_list.RemoveAllLocalities(); entity_list.RemoveAllLocalities();
} }

View File

@ -800,6 +800,9 @@ void LuaParser::ReloadQuests() {
encounter.second->Depop(); encounter.second->Depop();
} }
lua_encounters.clear(); lua_encounters.clear();
// so the Depop function above depends on the Process being called again so ...
// And there is situations where it wouldn't be :P
entity_list.EncounterProcess();
if(L) { if(L) {
lua_close(L); lua_close(L);