Changeset 7206 in orxonox.OLD for branches

Timestamp:

Mar 9, 2006, 10:12:18 PM (19 years ago)

Author:

rennerc

Message:

fixed some bugs

Location:

branches/std/src/lib

Files:

• parser/ini_parser/ini_parser.cc (modified) (2 diffs)
• particles/particle_system.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (2 diffs)
• util/loading/resource_manager.cc (modified) (2 diffs)

branches/std/src/lib/parser/ini_parser/ini_parser.cc

@@ -56 +56 @@
 {
   this->deleteSections();
-  this->setFileName(NULL);
+  this->setFileName("");
 }
 
@@ -71 +71 @@
 
   this->currentSection = this->sections.end();
-  this->setFileName(NULL);
+  this->setFileName("");
 }
 

branches/std/src/lib/particles/particle_system.cc

@@ -485 +485 @@
 void ParticleSystem::debug() const
 {
-  PRINT(0)("  ParticleCount: %d emitters: %d, maximumCount: %d :: filled %d%%\n", this->count, this->emitters.size(), this->maxCount, 100*this->count/this->maxCount);
+  PRINT(0)("  ParticleCount: %d emitters: %d, maximumCount: %d :: filled %d%%\n", this->count, this->emitters.size(), this->maxCount, ((this->maxCount!=0)?100*this->count/this->maxCount:0));
   if (deadList)
   {

branches/std/src/lib/util/loading/load_param.cc

@@ -234 +234 @@
 
   if (root == NULL)
-    return NULL;
+    return "";
 
   element = root->FirstChildElement( parameterName);
-  if( element == NULL) return NULL;
+  if( element == NULL) return "";
 
   node = element->FirstChild();
@@ -245 +245 @@
     node = node->NextSibling();
   }
-  return NULL;
+  return "";
 }
 

branches/std/src/lib/util/loading/resource_manager.cc

@@ -888 +888 @@
 {
   if (fileName.empty() || ResourceManager::getInstance()->getDataDir().empty())
-    return NULL;
+    return "";
 
   std::string retName = ResourceManager::getInstance()->getDataDir() +fileName;
@@ -894 +894 @@
     return retName;
   else
-    return NULL;
+    return "";
 }