fix collision zones

Try · Jun 28, 2021 · 461e9ca · 461e9ca
1 parent d6a2a01
commit 461e9ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/game/world/worldobjects.cpp b/game/world/worldobjects.cpp
@@ -63,9 +63,6 @@ WorldObjects::WorldObjects(World& owner):owner(owner){
   }
 
 WorldObjects::~WorldObjects() {
-  rootVobs.clear();
-  interactiveObj.clear();
-  items.clear();
   }
 
 void WorldObjects::load(Serialize &fin) {

diff --git a/game/world/worldobjects.h b/game/world/worldobjects.h
@@ -141,6 +141,8 @@ class WorldObjects final {
       };
 
     World&                             owner;
+
+    std::vector<CollisionZone*>        collisionZn;
     std::vector<std::unique_ptr<Vob>>  rootVobs;
 
     SpaceIndex<Interactive>            interactiveObj;
@@ -160,9 +162,6 @@ class WorldObjects final {
     std::vector<AbstractTrigger*>      triggers;
     std::vector<AbstractTrigger*>      triggersZn;
     std::vector<AbstractTrigger*>      triggersTk;
-
-    std::vector<CollisionZone*>        collisionZn;
-
     std::vector<PerceptionMsg>         sndPerc;
     std::vector<TriggerEvent>          triggerEvents;