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

Timestamp:

Jan 7, 2006, 11:17:51 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontrol branche back to the trunk

merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

File:

• trunk/src/world_entities/space_ships/helicopter.h (modified) (1 diff)

trunk/src/world_entities/space_ships/helicopter.h

@@ -67 +67 @@
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.
+    float                 rotorspeed;         //!< the speed of the rotor.
+    float                 tailrotorspeed;     //!< the relativ speed ot the tail rotor
 
     float                 airViscosity;