Changeset 7207 in orxonox.OLD for branches/std/src/world_entities/terrain.cc

Timestamp:

Mar 9, 2006, 11:35:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: evil was within

File:

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

branches/std/src/world_entities/terrain.cc

@@ -175 +175 @@
 
 
-void Terrain::loadVegetation(const char* vegetationFile)
-{
-  PRINTF(0)("loadVegetation: %s\n", vegetationFile);
+void Terrain::loadVegetation(const std::string& vegetationFile)
+{
+  PRINTF(0)("loadVegetation: %s\n", vegetationFile.c_str());
   if (this->vegetation)
     ResourceManager::getInstance()->unload(this->vegetation, RP_LEVEL);
-  if (vegetationFile != NULL)
+  if (!vegetationFile.empty())
   {
-    PRINTF(4)("fetching %s\n", vegetationFile);
+    PRINTF(4)("fetching %s\n", vegetationFile.c_str());
     this->vegetation = dynamic_cast<Model*>(ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN));
   }