Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/bsp_manager.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/importer/bsp_manager.cc (modified) (4 diffs)

trunk/src/lib/graphics/importer/bsp_manager.cc

@@ -33 +33 @@
 #include "world_entities/player.h"
 #include "world_entities/playable.h"
-#include "util/loading/resource_manager.h"
+
 // STL Containers
 #include <vector>
@@ -41 +41 @@
 #include "world_entity.h"
 
+#include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
@@ -91 +92 @@
   this->bspFile = new BspFile();
   this->bspFile->scale =  scale;
-  if(this->bspFile->read(ResourceManager::getFullName(fileName).c_str()) == -1)
+  if(this->bspFile->read(Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(fileName).c_str()) == -1)
     return -1;
 
@@ -1376 +1377 @@
     if( this->outputFraction == 1.0f) // No collision Detected
     {
-      if( this->outputAllSolid ) 
+      if( this->outputAllSolid )
       {
         this->collPlane = new plane;