Changeset 6868 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.h

Timestamp:

Jan 30, 2006, 4:41:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Network back to the trunk.
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6817:HEAD
no conflicts

File:

• trunk/src/world_entities/space_ships/space_ship.h (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.h

@@ -56 +56 @@
     bool                  bAscend;            //!< ascend button pressed.
     bool                  bDescend;           //!< descend button presses.
-    bool                  bFire;              //!< fire button pressed.
+//    bool                  bFire;              //!< fire button pressed.(moved to playable)
     bool                  bRollL;             //!< rolling button pressed (left)
     bool                  bRollR;             //!< rolling button pressed (right)
@@ -80 +80 @@
     float                 airViscosity;
 
-    int oldMask;
+    byte                  oldMask;            //!< used for synchronisation
 
     ParticleEmitter*      burstEmitter;