Changeset 2493 for code/branches/presentation/src/orxonox/objects/controllers/HumanController.cc

Timestamp:

Dec 17, 2008, 2:10:11 AM (16 years ago)

Author:

landauf

Message:

merged weapon2 branch to presentation

Location:

code/branches/presentation

Files:

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

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

@@ -110 +110 @@
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->fire();
+            HumanController::localController_s->controllableEntity_->fire(WeaponMode::fire);
     }
 
@@ -116 +116 @@
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->altFire();
+            HumanController::localController_s->controllableEntity_->fire(WeaponMode::altFire);
     }