Changeset 8907 in orxonox.OLD for branches/single_player_map/src/world_entities/bsp_entity.cc

Timestamp:

Jun 29, 2006, 2:10:27 PM (19 years ago)

Author:

bottac

Message:

further bugs fixed.

File:

• branches/single_player_map/src/world_entities/bsp_entity.cc (modified) (3 diffs)

branches/single_player_map/src/world_entities/bsp_entity.cc

@@ -39 +39 @@
 BspEntity::~BspEntity ()
 {
-  if( this->bspManager)
+  if( this->bspManager != NULL)
     delete this->bspManager;
 }
@@ -51 +51 @@
 void BspEntity::init()
 {
-  this->setClassID(CL_BSP_ENTITY, "BspEntity");
+
   this->bspManager = NULL;
   /**
@@ -64 +64 @@
 
   // Check wether file exists....
-  if ( File(ResourceManager::getFullName(name)).exists()  ){
-    // War das Laden erfolgreich?
+  if ( File(ResourceManager::getFullName(name)).exists()  ) {
+
+    this->setClassID(CL_BSP_ENTITY, "BspEntity");
     this->bspManager = new BspManager(this);
+
     if(this->bspManager->load(name.c_str(), 0.1f) == -1 ) {
       this->bspManager = NULL;
-      // Dont do anything
+
     } else {
-
-     
       this->toList(OM_ENVIRON); // Success!!!
     }
   } else {
+    this->bspManager = NULL;
     this->toList(OM_DEAD);
   }