Changeset 9003 in orxonox.OLD for trunk/src/world_entities/bsp_entity.cc

Timestamp:

Jul 2, 2006, 1:36:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

• trunk/src/world_entities/bsp_entity.cc (modified) (7 diffs)

trunk/src/world_entities/bsp_entity.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
-
+ 
    Copyright (C) 2004 orx
-
+ 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-
+ 
    ### File Specific:
    main-programmer: Claudio Botta
@@ -15 +15 @@
 
 #include "bsp_entity.h"
+#include "util/loading/resource_manager.h"
 #include "util/loading/resource_manager.h"
 
@@ -38 +39 @@
 BspEntity::~BspEntity ()
 {
-  if( this->bspManager)
+  if( this->bspManager != NULL)
     delete this->bspManager;
 }
+
 
 
@@ -49 +51 @@
 void BspEntity::init()
 {
-  this->setClassID(CL_BSP_ENTITY, "BspEntity");
 
-  this->bspManager = new BspManager(this);
-  this->toList(OM_ENVIRON);
-
+  this->bspManager = NULL;
   /**
    * @todo: Write CL_BSP_ENTITY INTO THE src/defs/class_id.h (your own definition)
@@ -64 +63 @@
   PRINTF(0)("+++++++++++ LOADING NAME %s\n", name.c_str());
 
-  this->bspManager->load(name.c_str(), 0.1f);
+  // Check wether file exists....
+  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;
+
+    } else {
+      this->toList(OM_ENVIRON); // Success!!!
+    }
+  } else {
+    this->bspManager = NULL;
+    this->toList(OM_DEAD);
+  }
 }
 
@@ -76 +90 @@
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
- // WorldEntity::loadParam(root);
+  // WorldEntity::loadParam(root);
 
   LoadParam(root, "Name", this, BspEntity, setName)
-      .describe("Sets the of the BSP file.");
+  .describe("Sets the of the BSP file.");
 
-/*  LoadParam(root, "Scale", this, BSpEntity, setScale)
-      .describe("Sets the scale factore of the bsp level.");
-*/
+  /*  LoadParam(root, "Scale", this, BSpEntity, setScale)
+        .describe("Sets the scale factore of the bsp level.");
+  */
 
   /**
@@ -115 +129 @@
  */
 void BspEntity::collidesWith (WorldEntity* entity, const Vector& location)
-{
-
-}
+{}