Changeset 9272 in orxonox.OLD

Timestamp:

Jul 13, 2006, 3:17:50 PM (18 years ago)

Author:

patrick

Message:

tighten up the interface

Location:

branches/proxy/src

Files:

• lib/network/handshake.cc (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (5 diffs)
• lib/network/network_monitor.cc (modified) (7 diffs)
• lib/network/network_monitor.h (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (5 diffs)
• lib/network/synchronizeable.h (modified) (3 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/proxy/src/lib/network/handshake.cc

@@ -30 +30 @@
   /* set the class id for the base object */
   this->setClassID(CL_HANDSHAKE, "Handshake");
-
-  this->setIsServer( nodeType == NET_MASTER_SERVER);
 
   // register all variable handlers

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

@@ -168 +168 @@
 bool NetworkGameManager::delSynchronizeableHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
-  if ( getInstance()->isServer() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() )
   {
     PRINTF(2)("Recieved DeleteSynchronizeable message from client %d!\n", userId);
@@ -229 +229 @@
 bool NetworkGameManager::preferedTeamHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
-  assert( NetworkGameManager::getInstance()->isServer() );
+  assert( SharedNetworkData::getInstance()->isMasterServer() );
 
   int teamId = 0;
@@ -261 +261 @@
 void NetworkGameManager::prefereTeam( int teamId )
 {
-  if ( isServer() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() )
     setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
   else
@@ -305 +305 @@
 {
   PRINTF(0)("NetworkGameManager::chatMessageHandler %d %d\n", userId, SharedNetworkData::getInstance()->getHostID() );
-  if ( NetworkGameManager::getInstance()->isServer() && userId !=  SharedNetworkData::getInstance()->getHostID() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() && userId !=  SharedNetworkData::getInstance()->getHostID() )
   {
     MessageManager::getInstance()->sendMessage( messageId, data, dataLength, RT_ALL_NOT_ME, 0, MP_HIGHBANDWIDTH );
@@ -347 +347 @@
   assert( Converter::stringToByteArray(message, buf+2*INTSIZE, message.length()+INTSIZE) == message.length()+INTSIZE );
 
-  if ( this->isServer() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() )
     MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
   else

branches/proxy/src/lib/network/network_monitor.cc

@@ -32 +32 @@
 NetworkMonitor::NetworkMonitor(NetworkStream* networkStream)
 {
-
+  this->playerNumber = 0;
 }
 
@@ -49 +49 @@
 {
   this->clientList.push_back(node);
+  this->playerNumber++;
 }
 
@@ -57 +58 @@
 {
   this->proxyServerList.push_back(node);
+  this->playerNumber++;
 }
 
@@ -65 +67 @@
 {
   this->masterServerList.push_back(node);
+  this->playerNumber++;
 }
 
@@ -78 +81 @@
     {
       this->clientList.erase(it);
+      this->playerNumber--;
       return;
     }
@@ -96 +100 @@
     {
       this->proxyServerList.erase(it);
+      this->playerNumber--;
       return;
     }
@@ -114 +119 @@
     {
       this->masterServerList.erase(it);
+      this->playerNumber--;
       return;
     }

branches/proxy/src/lib/network/network_monitor.h

@@ -45 +45 @@
 
     OrxGui::GLGuiBox*            box;
+
+    int                          playerNumber;                 //!< total number of players in the game
 };
 

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

@@ -38 +38 @@
   this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
   this->owner = 0;
-  this->setIsServer(SharedNetworkData::getInstance()->getHostID() == 0);
+//   this->setIsServer(SharedNetworkData::getInstance()->getHostID() == 0);
   this->uniqueID = NET_UID_UNASSIGNED;
   this->networkStream = NULL;
@@ -70 +70 @@
     this->networkStream->disconnectSynchronizeable(*this);
 
-    if ( this->isServer() && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( CL_MESSAGE_MANAGER ) )
+    if ( SharedNetworkData::getInstance()->isMasterServer() && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( CL_MESSAGE_MANAGER ) )
       NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
   }
@@ -113 +113 @@
  * @param isServer: the boolean value which the server flag is to set to
  */
-void Synchronizeable::setIsServer(bool isServer)
-{
-  if( isServer )
-    this->state = this->state | STATE_SERVER;
-  else
-    this->state = this->state & (~STATE_SERVER);
-}
+// void Synchronizeable::setIsServer(bool isServer)
+// {
+//   if( isServer )
+//     this->state = this->state | STATE_SERVER;
+//   else
+//     this->state = this->state & (~STATE_SERVER);
+// }
 
 
@@ -126 +126 @@
  * @return true, if the server flag is true, false else
  */
-bool Synchronizeable::isServer()
-{
-  return (this->state & STATE_SERVER) >0;
-}
+// bool Synchronizeable::isServer()
+// {
+//   return (this->state & STATE_SERVER) >0;
+// }
 
 
@@ -222 +222 @@
   {
     hasPermission = (
-            this->isServer() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ) ||
+        SharedNetworkData::getInstance()->isMasterServer() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ) ||
         this->owner == SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) ||
-            this->isServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) ||
+        SharedNetworkData::getInstance()->isMasterServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) ||
             (*it)->checkPermission( PERMISSION_ALL )
                     );

branches/proxy/src/lib/network/synchronizeable.h

@@ -51 +51 @@
     virtual ~Synchronizeable();
 
-    void setIsServer( bool isServer );
-    bool isServer();
+//     void setIsServer( bool isServer );
+//     bool isServer();
 
     virtual void varChangeHandler( std::list<int> & id );
@@ -61 +61 @@
     virtual void handleSentState( int userId, int stateId, int fromStateId );
     virtual void handleRecvState( int userId, int stateId, int fromStateId );
-    
+
     void registerVar( SynchronizeableVar * var );
     int registerVarId( SynchronizeableVar * var );
@@ -82 +82 @@
   protected:
     NetworkStream*    networkStream;  //!< reference network stream we are connected to
-    int               state;
+//     int               state;
 
   private:

branches/proxy/src/world_entities/space_ships/space_ship.cc

@@ -314 +314 @@
   if( entity->isA(CL_PROJECTILE) && entity != ref)
   {
-    if ( isServer() )
+    if ( SharedNetworkData::getInstance()->isMasterServer() )
     {
       //TODO handle this