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

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 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/world_entities/bsp_entity.cc (modified) (3 diffs)

trunk/src/world_entities/bsp_entity.cc

@@ -15 +15 @@
 
 #include "bsp_entity.h"
-#include "util/loading/resource_manager.h"
-#include "util/loading/resource_manager.h"
 
-CREATE_FACTORY(BspEntity, CL_BSP_ENTITY);
+#include "debug.h"
+#include "loading/resource_manager.h"
+
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
+CREATE_FACTORY(BspEntity);
 
 
@@ -51 +54 @@
 void BspEntity::init()
 {
+  this->registerObject(this, BspEntity::_objectList);
 
   this->bspManager = NULL;
@@ -67 +71 @@
 
   // Check wether file exists....
-  if ( File(ResourceManager::getFullName(name)).exists()  ) {
+  if ( File(Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(name)).exists()  ) {
 
-    this->setClassID(CL_BSP_ENTITY, "BspEntity");
     this->bspManager = new BspManager(this);