Changeset 6863 in orxonox.OLD

Timestamp:

Jan 30, 2006, 11:42:44 AM (18 years ago)

Author:

patrick

Message:

trunk: fixed the segfault problem, when restarting world

Location:

trunk/src

Files:

• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)

trunk/src/story_entities/game_world_data.cc

@@ -266 +266 @@
     delete this->objectManager;
   }
+
   if(State::getSkyBox())
     State::setSkyBox(NULL);
+
+  glmis = NULL;
+  localCamera = NULL;
+  localPlayer = NULL;
+  sky = NULL;
+  terrain = NULL;
+  music = NULL;
+  objectManager = NULL;
 }
 

trunk/src/world_entities/skybox.cc

@@ -105 +105 @@
   for (int i = 0; i < 6; i++)
   {
-    delete this->material[i];
-    delete this->cubeTexture[i];
+    if( this->material[i])
+      delete this->material[i];
+//     if( this->cubeTexture[i])
+//       delete this->cubeTexture[i];
   }
 }