Changeset 1588 for code/branches/hud/src/orxonox/objects/weapon

Timestamp:

Jun 11, 2008, 12:21:42 AM (17 years ago)

Author:

rgrieder

Message:

• added XML loadable HUD
• Radar and navi are not yet done
• explanations follow with when things are finished

Location:

code/branches/hud/src/orxonox/objects/weapon

Files:

• AmmunitionDump.h (modified) (1 diff)
• BaseWeapon.h (modified) (1 diff)
• Bullet.h (modified) (1 diff)
• BulletManager.h (modified) (1 diff)

code/branches/hud/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -56 +56 @@
     int getStockSize(const std::string &name);
 
-    virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };
-
 
   protected:

code/branches/hud/src/orxonox/objects/weapon/BaseWeapon.h

@@ -72 +72 @@
     void setAmmoDump(AmmunitionDump*);
 
-    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
-
     virtual void tick(float dt);
 

code/branches/hud/src/orxonox/objects/weapon/Bullet.h

@@ -45 +45 @@
 
     virtual void tick(float dt) { }
-
-    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
  };
 }

code/branches/hud/src/orxonox/objects/weapon/BulletManager.h

@@ -57 +57 @@
     virtual void tick(float dt);
 
-    inline virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };
-
   protected:
     inline bool create() { return Synchronisable::create(); }