Changeset 10114 in orxonox.OLD for trunk/src/lib/graphics/importer/md2/resource_md2.cc

Timestamp:

Dec 19, 2006, 11:55:26 PM (19 years ago)

Author:

patrick

Message:

merged network back to trunk

File:

• trunk/src/lib/graphics/importer/md2/resource_md2.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/md2/resource_md2.cc

@@ -20 +20 @@
     PRINTF(0)("NOT FOUND MD2: %s\n", modelName.c_str());
     std::string modelFileName = this->Resource::locateFile(modelName);
-    //std::string skinFileName = this->Resource::locateFile(skinName);
+    std::string skinFileName = this->Resource::locateFile(skinName);
+    PRINTF(0)("NEW %s::%s\n", modelName.c_str(), modelFileName.c_str());
     this->MD2Model::load(modelFileName, skinName, scale);
-    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
+    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinFileName, scale), keepLevel, this->MD2Model::dataPointer()));
   }