Changeset 3053 for code/trunk/src/orxonox/objects/controllers

Timestamp:

May 25, 2009, 4:19:14 AM (16 years ago)

Author:

landauf

Message:

merged weapons branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/controllers/AIController.cc (modified) (1 diff)
• src/orxonox/objects/controllers/HumanController.cc (modified) (2 diffs)
• src/orxonox/objects/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/objects/controllers/WaypointPatrolController.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/controllers/AIController.cc

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

code/trunk/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, reload,        true);
     SetConsoleCommand(HumanController, boost,         true).keybindMode(KeybindMode::OnHold);
     SetConsoleCommand(HumanController, greet,         true);
@@ -109 +109 @@
     }
 
-    void HumanController::fire()
+    void HumanController::fire(unsigned int firemode)
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->fire(WeaponMode::fire);
+            HumanController::localController_s->controllableEntity_->fire(firemode);
     }
 
-    void HumanController::altFire()
+    void HumanController::reload()
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->fire(WeaponMode::altFire);
+            HumanController::localController_s->controllableEntity_->reload();
     }
 

code/trunk/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 reload();
 
             static void boost();

code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc

@@ -68 +68 @@
 
             if (this->getControllableEntity() && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
-                this->getControllableEntity()->fire(WeaponMode::fire);
+                this->getControllableEntity()->fire(0);
         }
         else