Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-01-27 18:42:21 +0000
committerStijn Buys <ingar@osirion.org>2011-01-27 18:42:21 +0000
commit5067041f2a712674c256344a8017eb7f99f1d1a6 (patch)
tree87ffad71e4006ab72db623fc0e6c55df013f2bb0 /src/core
parent2a87246be478e5ddd2bef4080f36382a889e02dd (diff)
Fix a segmentation fault when disconnecting from a server.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/zone.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/zone.cc b/src/core/zone.cc
index a38959f..c298f78 100644
--- a/src/core/zone.cc
+++ b/src/core/zone.cc
@@ -141,6 +141,8 @@ Zone::Zone(std::istream & is) : Label()
// client side does not setup a bullet physics environment
zone_bullet_cache = 0;
zone_bullet_world = 0;
+ zone_bullet_raycaster = 0;
+
receive_server_update(is);
}
@@ -152,12 +154,13 @@ Zone::~Zone()
zone_content.clear();
- if (zone_bullet_raycaster)
- delete zone_bullet_raycaster;
-
if (zone_bullet_world)
delete zone_bullet_world;
+
+ if (zone_bullet_raycaster)
+ delete zone_bullet_raycaster;
+
if (zone_bullet_cache)
delete zone_bullet_cache;
}