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

Timestamp:

May 29, 2006, 3:28:41 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

File:

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

trunk/src/world_entities/space_ships/space_ship.h

@@ -43 +43 @@
     virtual void process(const Event &event);
 
-    virtual int       writeBytes(const byte* data, int length, int sender);
-    virtual int       readBytes(byte* data, int maxLength, int * reciever);
-
-    //HACK HACK HACK HACK make this private or remove it
-    void doCollideNetwork( float energy );
-    std::list<float>        networkCollisionList;
-
   private:
     void init();