From 461e9cac4656b9af2036ef0b6690d96a57a9e7c9 Mon Sep 17 00:00:00 2001 From: Try Date: Mon, 28 Jun 2021 06:40:59 +0200 Subject: [PATCH] fix collision zones --- game/world/worldobjects.cpp | 3 --- game/world/worldobjects.h | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/game/world/worldobjects.cpp b/game/world/worldobjects.cpp index 268156732..eaf5e6d14 100644 --- 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 index 25f5e2f3e..fd465d4bb 100644 --- a/game/world/worldobjects.h +++ b/game/world/worldobjects.h @@ -141,6 +141,8 @@ class WorldObjects final { }; World& owner; + + std::vector collisionZn; std::vector> rootVobs; SpaceIndex interactiveObj; @@ -160,9 +162,6 @@ class WorldObjects final { std::vector triggers; std::vector triggersZn; std::vector triggersTk; - - std::vector collisionZn; - std::vector sndPerc; std::vector triggerEvents;