Changeset 177 for code/branches/main_reto_vs05/src/orxonox_ship.h

Timestamp:

Nov 7, 2007, 12:39:30 AM (16 years ago)

Author:

rgrieder

Message:

 

File:

• code/branches/main_reto_vs05/src/orxonox_ship.h (modified) (3 diffs)

code/branches/main_reto_vs05/src/orxonox_ship.h

@@ -40 +40 @@
   {
   public:
-          OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*);
+          OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*, BulletManager*);
           virtual ~OrxonoxShip();
 
@@ -54 +54 @@
     Ogre::Vector3 getSpeed();
 
-          Bullet* fire();
+          void fire();
 
           bool tick(unsigned long, Ogre::Real);
@@ -69 +69 @@
     Ogre::Real baseThrust_;
           int objectCounter_;
-          Ogre::Vector3 bulletSpeed_;
+
+    BulletManager *bulletManager_;
+          //Ogre::Vector3 bulletSpeed_;
 
     WeaponManager *mainWeapon_;