Changeset 267 for code/branches/main_reto/src/orxonox_ship.h

Timestamp:

Nov 27, 2007, 3:02:03 PM (16 years ago)

Author:

rgrieder

Message:

• updated to current revision from Visual studio directory
• hopefully working libraries with cmake

File:

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

code/branches/main_reto/src/orxonox_ship.h

@@ -40 +40 @@
   {
   public:
-    OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*, weapon::BulletManager*);
+    OrxonoxShip(Ogre::SceneNode*);
           virtual ~OrxonoxShip();
 
@@ -54 +54 @@
     Ogre::Vector3 getSpeed();
 
-          void fire();
+    weapon::BaseWeapon* getMainWeapon();
+
+    int getAmmoStock();
 
           bool tick(unsigned long, Ogre::Real);
@@ -74 +76 @@
           //Ogre::Vector3 bulletSpeed_;
 
-    weapon::WeaponManager *mainWeapon_;
+    weapon::BaseWeapon *mainWeapon_;
+    weapon::WeaponStation *railGunStation_;
+
+    weapon::AmmunitionDump *ammoDump_;
   };