Changeset 2912 for code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc

Timestamp:

Apr 9, 2009, 3:18:11 AM (15 years ago)

Author:

landauf

Message:

Several small adjustments in the weaponsystem (like additional const keyword, includes moved from .h to .cc where possible, …)

Firemode is now an unsigned int instead of an Enum. Instead of "fire" and "altFire" use "fire 0" and "fire 1"

File:

• code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) (3 diffs)

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "WeaponSlot.h"
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/Debug.h"
 
-#include "WeaponSlot.h"
-
+#include "Weapon.h"
 
 namespace orxonox
@@ -47 +46 @@
         this->attachedWeapon_ = 0;
         this->setObjectMode(0x0);
+
+COUT(0) << "+WeaponSlot" << std::endl;
     }
 
     WeaponSlot::~WeaponSlot()
     {
+COUT(0) << "~WeaponSlot" << std::endl;
     }
 
+    void WeaponSlot::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(WeaponSlot, XMLPort, xmlelement, mode);
+    }
 
     /*sets the munition type
@@ -71 +77 @@
     }
 
-
-    void WeaponSlot::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(WeaponSlot, XMLPort, xmlelement, mode);
-    }
-
     void WeaponSlot::attachWeapon(Weapon *weapon)
     {