Changeset 7221 in orxonox.OLD for trunk/src/world_entities/world_entity.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/world_entity.h (modified) (2 diffs)

trunk/src/world_entities/world_entity.h

@@ -36 +36 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void loadModel(const char* fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
+  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
-  inline void loadMD2Texture(const char* fileName) { this->md2TextureFileName = fileName; }
+  inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
 
   bool buildObbTree(unsigned int depth);
@@ -113 +113 @@
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
-  const char*             md2TextureFileName; //!< the file name of the md2 model texture, only if this
-  const char*             modelLODName;       //!< the name of the model lod file
+  std::string             md2TextureFileName; //!< the file name of the md2 model texture, only if this
+  std::string             modelLODName;       //!< the name of the model lod file
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection