Skip to content

Commit 461e9ca

Browse files
committed
fix collision zones
1 parent d6a2a01 commit 461e9ca

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

game/world/worldobjects.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ WorldObjects::WorldObjects(World& owner):owner(owner){
6363
}
6464

6565
WorldObjects::~WorldObjects() {
66-
rootVobs.clear();
67-
interactiveObj.clear();
68-
items.clear();
6966
}
7067

7168
void WorldObjects::load(Serialize &fin) {

game/world/worldobjects.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ class WorldObjects final {
141141
};
142142

143143
World& owner;
144+
145+
std::vector<CollisionZone*> collisionZn;
144146
std::vector<std::unique_ptr<Vob>> rootVobs;
145147

146148
SpaceIndex<Interactive> interactiveObj;
@@ -160,9 +162,6 @@ class WorldObjects final {
160162
std::vector<AbstractTrigger*> triggers;
161163
std::vector<AbstractTrigger*> triggersZn;
162164
std::vector<AbstractTrigger*> triggersTk;
163-
164-
std::vector<CollisionZone*> collisionZn;
165-
166165
std::vector<PerceptionMsg> sndPerc;
167166
std::vector<TriggerEvent> triggerEvents;
168167

0 commit comments

Comments
 (0)