Changeset 2186 for code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons

Timestamp:

Nov 12, 2008, 12:50:18 PM (16 years ago)

Author:

polakma

Message:

made some changes (still doesn't compile)

Location:

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons

Files:

• LaserGun.cc (modified) (3 diffs)
• LaserGun.h (modified) (2 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -34 +34 @@
 #include "util/Debug.h"
 
+#include "LaserGun.h"
+
 
 namespace orxonox
@@ -41 +43 @@
         RegisterObject(LaserGun);
 
-        this->attachNeededMunition();
-
         //set weapon properties here
-        this->projectileColor_ = ColourValue(1.0, 1.0, 0.5)
         this->loadingTime_ = 0.5;
     }
@@ -76 +75 @@
     }
 
-    ColorValue LaserGun::getProjectileColor()
-    {
-        return projectileColor_;
-    }
-
-    void attachNeededMunition(Munition *pointerToMunition)
-    {
-        //if munition type already exist attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
-        if ( this->parentWeaponSystem_->munitionSet_[laserGunMunition] )
-            this->pointerToMunition_ = pointerToMunition;
-        else
-        {
-            this->pointerToMunition_ = new LaserGunMunition;
-
-        }
-    }
 }

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -34 +34 @@
 #include "core/BaseObject.h"
 
-#include "LaserGunMunition.h"
+#include "../munitions/LaserGunMunition.h"
 #include "util/Math.h"
+#include "../Weapon.h"
 
 namespace orxonox
@@ -48 +49 @@
 
             void fire();
-            ColourValue LaserGun::getProjectileColour();
+
 
         private:
-            ColorValue projectileColor_;
+
 
     };