Changeset 10240 in orxonox.OLD

Timestamp:

Jan 16, 2007, 11:04:11 PM (17 years ago)

Author:

patrick

Message:

not checkinf for invalid xml files. runs again

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/oif/object_information_file.cc (modified) (4 diffs)
• world_entities/mount_point.cc (modified) (1 diff)

branches/mount_points/src/lib/graphics/importer/oif/object_information_file.cc

@@ -29 +29 @@
  */
 OIFData::OIFData()
-{}
+{
+  this->_root = NULL;
+}
 
 
@@ -38 +40 @@
 OIFData::OIFData(const std::string& fileName)
 {
+  this->_root = NULL;
+
   this->load(fileName);
 }
@@ -48 +52 @@
 void OIFData::load(const std::string& fileName)
 {
-  //
+  PRINTF(0)("loading %s as oif data\n", fileName.c_str());
     if( fileName.empty())
   {
@@ -60 +64 @@
   {
     // report an error
-    PRINTF(3)("Could not load XML File %s: %s @ %d:%d\n", fileName.c_str(), XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+    PRINTF(1)("Could not load XML File %s: %s @ %d:%d\n", fileName.c_str(), XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
     return;
   }

branches/mount_points/src/world_entities/mount_point.cc

@@ -70 +70 @@
 void MountPoint::initMountPoint(const TiXmlElement* root)
 {
+  if( root == NULL)
+  {
+    PRINTF(1)("MountPoint - initialization failed, since I got no valid xml element\n");
+    return;
+  }
+  // now get the first element
   const TiXmlElement* element = root->FirstChildElement("MountPoints");
   if( element == NULL)