Changeset 8147 in orxonox.OLD for trunk/src/lib/network/network_game_manager.h

Timestamp:

Jun 5, 2006, 12:09:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8070:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
no conflicts

File:

• trunk/src/lib/network/network_game_manager.h (modified) (3 diffs)

trunk/src/lib/network/network_game_manager.h

@@ -12 +12 @@
 /* include base_object.h since all classes are derived from this one */
 #include "synchronizeable.h"
+#include "playable.h"
 #include "message_manager.h"
 
@@ -56 +57 @@
     
     void removeSynchronizeable( int uniqueId );
+    
+    void prefereTeam( int teamId );
 
     inline void setGameState( int gameState ){ this->gameState = gameState; }
     inline int getGameState(){ return this->gameState; }
+    
+    void tick( float ds );
 
   private:
@@ -64 +69 @@
     
     static bool delSynchronizeableHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
+    static bool preferedTeamHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
+    
+    void setPreferedTeam( int userId, int teamId );
 
     static NetworkGameManager*    singletonRef;
     
     int                           gameState;
+    
+    std::list<Playable*>          playablesToDelete;
 };