Changeset 2912 for code/branches/weapons/src/orxonox/objects/controllers

Timestamp:

Apr 9, 2009, 3:18:11 AM (16 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"

Location:

code/branches/weapons/src/orxonox/objects/controllers

Files:

• AIController.cc (modified) (1 diff)
• HumanController.cc (modified) (2 diffs)
• HumanController.h (modified) (1 diff)

code/branches/weapons/src/orxonox/objects/controllers/AIController.cc

@@ -111 +111 @@
 
         if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(500) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
-            this->getControllableEntity()->fire(WeaponMode::fire);
+            this->getControllableEntity()->fire(0);
 
         SUPER(AIController, tick, dt);

code/branches/weapons/src/orxonox/objects/controllers/HumanController.cc

@@ -46 +46 @@
     SetConsoleCommand(HumanController, rotateRoll,    true).setAsInputCommand();
     SetConsoleCommand(HumanController, fire,          true).keybindMode(KeybindMode::OnHold);
-    SetConsoleCommand(HumanController, altFire,       true).keybindMode(KeybindMode::OnHold);
     SetConsoleCommand(HumanController, boost,         true).keybindMode(KeybindMode::OnHold);
     SetConsoleCommand(HumanController, greet,         true);
@@ -109 +108 @@
     }
 
-    void HumanController::fire()
+    void HumanController::fire(unsigned int firemode)
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->fire(WeaponMode::fire);
-    }
-
-    void HumanController::altFire()
-    {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->fire(WeaponMode::altFire);
+            HumanController::localController_s->controllableEntity_->fire(firemode);
     }
 

code/branches/weapons/src/orxonox/objects/controllers/HumanController.h

@@ -51 +51 @@
             static void rotateRoll(const Vector2& value);
 
-            static void fire();
-            static void altFire();
+            static void fire(unsigned int firemode);
 
             static void boost();