Changeset 10666 in orxonox.OLD for branches/adm/src/world_entities/npcs

Timestamp:

May 31, 2007, 4:13:43 PM (18 years ago)

Author:

retolu

Message:

little changes, arranged clearlier

File:

• branches/adm/src/world_entities/npcs/adm_turret.cc (modified) (3 diffs)

branches/adm/src/world_entities/npcs/adm_turret.cc

@@ -36 +36 @@
 
 /**
-*  destructs the turret, deletes allocated memory
+* destructs the turret, deletes allocated memory
 */
 AdmTurret::~AdmTurret ()
@@ -43 +43 @@
 }
 
+/**
+* Constructor with XML Element
+*/
 AdmTurret::AdmTurret (const  TiXmlElement* root)
 {
@@ -78 +81 @@
 void AdmTurret::loadParams(const TiXmlElement* root)
 {
-        WorldEntity::loadParams(root);
+        if (root != NULL)
+        {
+                WorldEntity::loadParams(root);
 
-        LoadParam(root, "target", this, AdmTurret, setTarget)
-                .describe("the filename of the World Entity, that is to be shot at")
-                .defaultValues("");
+                LoadParam(root, "target", this, AdmTurret, setTarget)
+                        .describe("the filename of the World Entity, that is to be shot at")
+                        .defaultValues("");
+        }
 }