Changeset 8067 in orxonox.OLD for branches/network/src/lib

Timestamp:

Jun 1, 2006, 2:06:53 PM (19 years ago)

Author:

rennerc

Message:

implemented gamestates for multiplayerTeamDeathmatch

Location:

branches/network/src/lib/network

Files:

• message_manager.cc (modified) (2 diffs)
• message_manager.h (modified) (1 diff)
• network_game_manager.cc (modified) (4 diffs)
• network_game_manager.h (modified) (3 diffs)
• player_stats.cc (modified) (2 diffs)
• player_stats.h (modified) (4 diffs)
• synchronizeable.cc (modified) (2 diffs)

branches/network/src/lib/network/message_manager.cc

@@ -309 +309 @@
   {
     if ( 
-         recieverType == RT_ALL ||
+         recieverType == RT_ALL_ME ||
+         recieverType == RT_ALL_NOT_ME ||
          recieverType == RT_USER && it->first == reciever ||
          recieverType == RT_NOT_USER && it->first != reciever
@@ -324 +325 @@
       
       it->second.messages.push_back( msg );
-    }
-  }
-}
-
-
+      
+      if ( recieverType == RT_ALL_ME )
+        incomingMessabeBuffer.push_back( msg );
+    }
+  }
+}
+
+

branches/network/src/lib/network/message_manager.h

@@ -36 +36 @@
 enum RecieverType
 {
-  RT_ALL = 1,   //!< message is sent to all users
-  RT_USER,      //!< message is only sent to reciever
-  RT_NOT_USER   //!< message is sent to all but reciever
+  RT_ALL_NOT_ME = 1,   //!< message is sent to all users
+  RT_ALL_ME,           //!< message is sent to all users
+  RT_USER,             //!< message is only sent to reciever
+  RT_NOT_USER          //!< message is sent to all but reciever
 };
 

branches/network/src/lib/network/network_game_manager.cc

@@ -59 +59 @@
   
   MessageManager::getInstance()->registerMessageHandler( MSGID_DELETESYNCHRONIZEABLE, delSynchronizeableHandler, NULL );
+  
+  this->gameState = 0;
+  registerVar( new SynchronizeableInt( &gameState, &gameState, "gameState" ) );
 }
 
@@ -118 +121 @@
 bool NetworkGameManager::signalLeftPlayer(int userID)
 {
+  delete PlayerStats::getStats( userID )->getPlayable();
+  delete PlayerStats::getStats( userID );
 }
 
@@ -166 +171 @@
 void NetworkGameManager::removeSynchronizeable( int uniqueId )
 {
+  byte buf[INTSIZE];
+  
+  assert( Converter::intToByteArray( uniqueId, buf, INTSIZE ) == INTSIZE );
+  
+  MessageManager::getInstance()->sendMessage( MSGID_DELETESYNCHRONIZEABLE, buf, INTSIZE, RT_ALL_NOT_ME, 0, MP_HIGHBANDWIDTH );
 }
 
@@ -172 +182 @@
 
 
+

branches/network/src/lib/network/network_game_manager.h

@@ -47 +47 @@
   public:
     virtual ~NetworkGameManager();
-
+    
     static NetworkGameManager* NetworkGameManager::getInstance()
     { if (!NetworkGameManager::singletonRef) NetworkGameManager::singletonRef = new NetworkGameManager(); return NetworkGameManager::singletonRef; }
@@ -57 +57 @@
     void removeSynchronizeable( int uniqueId );
 
+    inline void setGameState( int gameState ){ this->gameState = gameState; }
+    inline int getGameState(){ return this->gameState; }
 
   private:
@@ -64 +66 @@
 
     static NetworkGameManager*    singletonRef;
+    
+    int                           gameState;
 };
 

branches/network/src/lib/network/player_stats.cc

@@ -48 +48 @@
 
   this->userId = 0;
-  this->teamId = 0;
+  this->teamId = TEAM_NOTEAM;
+  this->preferedTeamId = TEAM_NOTEAM;
   this->score = 0;
   this->playableClassId = 0;
@@ -54 +55 @@
   
   userId_handle = registerVarId( new SynchronizeableInt( &userId, &userId, "userId" ) );
-  groupId_handle = registerVarId( new SynchronizeableInt( &teamId, &teamId, "teamId" ) );
+  teamId_handle = registerVarId( new SynchronizeableInt( &teamId, &teamId, "teamId" ) );
+  preferedTeamId_handle = registerVarId( new SynchronizeableInt( &preferedTeamId, &preferedTeamId, "preferedUserId" ) );
   score_handle = registerVarId( new SynchronizeableInt( &score, &score, "score" ) );
   playableClassId_handle = registerVarId( new SynchronizeableInt( &playableClassId, &playableClassId, "playableClassId") );

branches/network/src/lib/network/player_stats.h

@@ -12 +12 @@
 #include <string>
 #include <list>
+
+enum
+{
+  TEAM_NOTEAM = -3,
+  TEAM_RANDOM = -2,
+  TEAM_SPECTATOR = -1
+};
 
 //! A class for storing player information
@@ -31 +38 @@
     inline void setTeamId( int teamId ){ this->teamId = teamId; }
     
+    inline int getPreferedTeamId(){ return preferedTeamId; }
+    inline void setPreferedTeamId( int preferedTeamId ){ this->preferedTeamId = preferedTeamId; }
+    
     inline int getScore(){ return score; }
     inline void setScore( int score ){ this->score = score; }
@@ -48 +58 @@
     int userId;                //!< userId
     int teamId;                //!< teamId
+    int preferedTeamId;        //!< preferedTeamId
 
     int score;                 //!< users score points
@@ -58 +69 @@
     // handles for SynchronizeableVars
     int userId_handle;
-    int groupId_handle;
+    int teamId_handle;
+    int preferedTeamId_handle;
     int score_handle;
     int playableClassId_handle;

branches/network/src/lib/network/synchronizeable.cc

@@ -21 +21 @@
 #include "netdefs.h"
 #include "network_log.h"
+#include "network_game_manager.h"
 
 #include "state.h"
@@ -68 +69 @@
   if ( this->networkStream )
     this->networkStream->disconnectSynchronizeable(*this);
+  
+  if ( this->isServer() && this->beSynchronized() && this->getUniqueID() > 0 )
+    NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
 }