Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/util/resource_manager.cc

Timestamp:

May 27, 2005, 7:14:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:

• orxonox/branches/physics/src/util/resource_manager.cc (modified) (1 diff)

orxonox/branches/physics/src/util/resource_manager.cc

@@ -38 +38 @@
 ResourceManager::ResourceManager () 
 {
-   this->setClassName ("ResourceManager");
+   this->setClassID(CL_RESOURCE_MANAGER, "ResourceManager");
    this->dataDir = NULL;
    this->setDataDir("./");