Changeset 7101 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 7, 2006, 6:48:10 PM (18 years ago)

Author:

patrick

Message:

spaceship collides with arena

Location:

trunk/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (1 diff)
• space_ship.h (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -772 +772 @@
 }
 
+
 void SpaceShip::doCollideNetwork( float energy )
 {

trunk/src/world_entities/space_ships/space_ship.h

@@ -47 +47 @@
 
 
+    //HACK HACK HACK make this private or remove it
+    void doCollideNetwork( float energy );
+
   private:
     void init();
@@ -52 +55 @@
     void calculateVelocity(float time);
 
-    void doCollideNetwork( float energy );
+
 
     bool                  bUp;                //!< up button pressed.