Changeset 2097 for code/trunk/src/orxonox/objects/weaponSystem/weapons

Timestamp:

Nov 1, 2008, 10:27:12 PM (16 years ago)

Author:

landauf

Message:

adopted weapon classes to the new hierarchy (with a creator pointer)

Location:

code/trunk/src/orxonox/objects/weaponSystem/weapons

Files:

• LaserGun.cc (modified) (1 diff)
• LaserGun.h (modified) (1 diff)
• Missile.cc (modified) (1 diff)
• Missile.h (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    LaserGun::LaserGun()
+    LaserGun::LaserGun(BaseObject* creator) : Weapon(creator)
     {
         RegisterObject(LaserGun);

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport LaserGun : public BaseObject : public Weapon
+    class _OrxonoxExport LaserGun : public Weapon
     {
         public:
-            LaserGun();
+            LaserGun(BaseObject* creator);
             virtual ~LaserGun();
 

code/trunk/src/orxonox/objects/weaponSystem/weapons/Missile.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    Missile::Missile()
+    Missile::Missile(BaseObject* creator) : Weapon(creator)
     {
         RegisterObject(Missile);

code/trunk/src/orxonox/objects/weaponSystem/weapons/Missile.h

@@ -40 +40 @@
     {
         public:
-            Missile();
+            Missile(BaseObject* creator);
             virtual ~Missile();