Changeset 9869 in orxonox.OLD for trunk/src/story_entities/story_entity.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/story_entities/story_entity.cc (modified) (3 diffs)

trunk/src/story_entities/story_entity.cc

@@ -22 +22 @@
 #include "story_entity.h"
 
-#include "util/loading/load_param.h"
-#include "util/loading/resource_manager.h"
+#include "loading/load_param.h"
+#include "loading/resource_manager.h"
 
+#include "debug.h"
 
-
-
+ObjectListDefinition(StoryEntity);
 
 /**
@@ -34 +34 @@
 StoryEntity::StoryEntity ()
 {
-  this->setClassID(CL_STORY_ENTITY, "StoryEntity");
+  this->registerObject(this, StoryEntity::_objectList);
 
   this->bInit = false;
@@ -107 +107 @@
   }
   else
-    this->loadFile = ResourceManager::getFullName(fileName);
+    this->loadFile = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
 
   this->grabWorldInfo();