Changeset 637 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 19, 2007, 1:49:24 AM (16 years ago)

Author:

rgrieder

Message:

 

Location:

code/branches/FICN/src/orxonox/objects

Files:

• BaseEntity.h (modified) (1 diff)
• BaseObject.cc (modified) (1 diff)
• BaseObject.h (modified) (1 diff)
• Fighter.cc (added)
• Fighter.h (added)
• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• weapon_system (added)
• weapon_system/CMakeLists.txt (added)
• weapon_system/ammunition_dump.cc (added)
• weapon_system/ammunition_dump.h (added)
• weapon_system/barrel_gun.cc (added)
• weapon_system/barrel_gun.h (added)
• weapon_system/base_weapon.cc (added)
• weapon_system/base_weapon.h (added)
• weapon_system/bullet.cc (added)
• weapon_system/bullet.h (added)
• weapon_system/bullet_manager.cc (added)
• weapon_system/bullet_manager.h (added)
• weapon_system/weapon_platform.h (added)
• weapon_system/weapon_prereq.h (added)
• weapon_system/weapon_station.cc (added)
• weapon_system/weapon_station.h (added)

code/branches/FICN/src/orxonox/objects/BaseEntity.h

@@ -3 +3 @@
 
 #include "WorldEntity.h"
-#include "../../tinyxml/tinyxml.h"
+#include <tinyxml/tinyxml.h>
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/BaseObject.cc

@@ -51 +51 @@
     {
     }
+
+    /**
+        @brief load general xml paramters
+    */
+    void BaseObject::loadParams(TiXmlElement* xmlElem)
+    {
+        if (xmlElem->Attribute("name"))
+        {
+            this->setName(xmlElem->Attribute("mesh"));
+        }
+    }
 }

code/branches/FICN/src/orxonox/objects/BaseObject.h

@@ -20 +20 @@
             BaseObject();
             virtual ~BaseObject();
-            virtual void loadParams(TiXmlElement* xmlElem) {}
+            virtual void loadParams(TiXmlElement* xmlElem);
     };
 }

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -85 +85 @@
     {
         BaseObject::loadParams(xmlElem);
-
-        if (xmlElem->Attribute("name"))
-        {
-            this->setName(xmlElem->Attribute("mesh"));
-        }
 
         if (xmlElem->Attribute("position"))

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -2 +2 @@
 #define _WorldEntity_H__
 
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+
+#include "network/Synchronisable.h"
+#include "tinyxml/tinyxml.h"
+#include "../core/CoreIncludes.h"
 #include "BaseObject.h"
 #include "Tickable.h"
-#include "../core/CoreIncludes.h"
-#include "OgreSceneManager.h"
-#include "OgreSceneNode.h"
 #include "Mesh.h"
-#include "network/Synchronisable.h"
-#include "tinyxml/tinyxml.h"
 
 namespace orxonox