Changeset 7116 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Feb 8, 2006, 9:39:53 AM (18 years ago)

Author:

rennerc

Message:

terrain collision hack

File:

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

trunk/src/world_entities/space_ships/space_ship.h

@@ -46 +46 @@
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
 
-
-    //HACK HACK HACK make this private or remove it
+    //HACK HACK HACK HACK make this private or remove it
     void doCollideNetwork( float energy );
+    std::list<float>        networkCollisionList;
 
   private:
@@ -54 +54 @@
 
     void calculateVelocity(float time);
-
-
 
     bool                  bUp;                //!< up button pressed.
@@ -91 +89 @@
     ParticleEmitter*      burstEmitter;
     ParticleSystem*       burstSystem;
-
-    std::list<float>        networkCollisionList;
 };