Changeset 1634 for code/branches/gcc43/src/orxonox/objects/weapon

Timestamp:

Jun 29, 2008, 7:36:33 PM (16 years ago)

Author:

nicolasc

Message:

just a test - don't morge this

Location:

code/branches/gcc43/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/gcc43/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -60 +60 @@
 
   protected:
-    inline bool create() { return Synchronisable::create(); }
+    bool create() { return Synchronisable::create(); }
     void registerAllVariables();
 

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

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

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

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

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

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