Changeset 10414 in orxonox.OLD for trunk

Timestamp:

Jan 27, 2007, 10:24:52 PM (18 years ago)

Author:

snellen

Message:

fixed segfault if syntax error in xml

Location:

trunk/src/world_entities

Files:

• cameraman.cc (modified) (2 diffs)
• cameraman.h (modified) (1 diff)

trunk/src/world_entities/cameraman.cc

@@ -63 +63 @@
 {
   BaseObject::loadParams(root);
-  const TiXmlElement* camerasTag = root->FirstChildElement("Cameras");
-  if( camerasTag != NULL)
-  {
+  LoadParamXML(root, "Cameras", this, CameraMan, createCameras);
+}
+
+
+void CameraMan::createCameras(const TiXmlElement* camerasTag)
+{
+
     LOAD_PARAM_START_CYCLE(camerasTag, object);
     {
@@ -71 +75 @@
     }
     LOAD_PARAM_END_CYCLE(object);
-  }
-
-}
+
+}
+
 
 

trunk/src/world_entities/cameraman.h

@@ -26 +26 @@
     void setCam(Camera* camera);
 
+    void createCameras(const TiXmlElement* camerasTag);
     void createCam(const TiXmlElement* root);
     void moveCam(int x, int y, int z,  int camNo);