Changeset 194 for code/branches/main_reto_vs05/src/orxonox_ship.cc

Timestamp:

Nov 11, 2007, 2:24:50 PM (16 years ago)

Author:

rgrieder

Message:

• added primary and secondary fire in continuous mode
• weapon manager yet very inflexible (one weapon, static values, etc.)

File:

• code/branches/main_reto_vs05/src/orxonox_ship.cc (modified) (2 diffs)

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -26 +26 @@
  */
 
-#include "OgreSceneManager.h"
+#include "OgreMath.h"
+#include "OgreVector3.h"
+#include "OgreQuaternion.h"
 #include "OgreSceneNode.h"
 #include "OgreEntity.h"
-#include "OgreVector3.h"
-#include "OgreStringConverter.h"
+#include "OgreSceneManager.h"
 
 #include "inertial_node.h"
@@ -197 +198 @@
   * @return Bullet containing speed and entity.
   */
-  void OrxonoxShip::fire()
-  {
-    mainWeapon_->primaryFireRequest();
+  WeaponManager* OrxonoxShip::getMainWeapon()
+  {
+    return mainWeapon_;
   }