Changeset 7216 in orxonox.OLD for branches/std/src/world_entities/terrain.h

Timestamp:

Mar 12, 2006, 8:54:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/std:: compile and run again, with many more std::strings….

File:

• branches/std/src/world_entities/terrain.h (modified) (1 diff)

branches/std/src/world_entities/terrain.h

@@ -43 +43 @@
   void loadVegetation(const std::string& vegetationFile);
 
-  void loadHeightMap(const char* heightMapFile, const char* colorMap = NULL);
-  void loadTexture(const char* textureName);
+  void loadHeightMap(const std::string& heightMapFile, const std::string& colorMap);
+  void loadTexture(const std::string& textureName);
   void setScale(float x, float y, float z);