Changeset 6222 in orxonox.OLD for trunk/src/world_entities/space_ships/helicopter.h

Timestamp:

Dec 21, 2005, 1:49:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/world_entities/space_ships/helicopter.h (modified) (3 diffs)

trunk/src/world_entities/space_ships/helicopter.h

@@ -24 +24 @@
     void loadParams(const TiXmlElement* root);
 
+    virtual void enter();
+    virtual void leave();
+
     void addWeapon(Weapon* weapon );
     void removeWeapon(Weapon* weapon);
@@ -39 +42 @@
 
   private:
-
     void calculateVelocity(float time);
     void weaponAction();
@@ -65 +67 @@
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.
-    
+
     float                 airViscosity;