Changeset 11990 for code/branches/Masterserver_FS18/src/libraries/network/Server.cc

Timestamp:

May 24, 2018, 3:24:00 PM (6 years ago)

Author:

mdedial

Message:

Clean up code, remove TODOs and dead code.

File:

• code/branches/Masterserver_FS18/src/libraries/network/Server.cc (modified) (12 diffs)

code/branches/Masterserver_FS18/src/libraries/network/Server.cc

@@ -167 +167 @@
       {
         timeSinceLastUpdate_ -= static_cast<unsigned int>(timeSinceLastUpdate_ / NETWORK_PERIOD) * NETWORK_PERIOD;
-        updateGamestate();
+        this->updateGamestate();
       }
     }
@@ -178 +178 @@
 
   /**
-   * Return ping time to client in milliseconds.
-   */
-  unsigned int Server::getRTT(unsigned int clientID)
+   * Print ping time to client in milliseconds.
+   */
+  void Server::printRTT()
   {
     // TODO: Implement
-    return 0;
-  }
-
-  /**
-   * Print ping time to client in milliseconds.
-   */
-  void Server::printRTT()
-  {
-    // TODO: Implement
-  }
-
-  /**
-   * Return packet loss ratio to client (scales from 0 to 1).
-   */
-  float Server::getPacketLoss(unsigned int clientID)
-  {
-    // TODO: Implement
-    return 0.;
   }
 
@@ -214 +196 @@
     }
     GamestateManager::update();
-    sendGameStates();
-    sendObjectDeletes();
+    this->sendGameStates();
+    this->sendObjectDeletes();
   }
 
@@ -255 +237 @@
       orxout(internal_warning, context::network) << "Server: could not broadcast deleteObjects packet" << endl;
     }
-
-    // TODO: Possible memory leak?
-    // del is allocated but only deleted if fetchIDs() returns false
 
     return true;
@@ -277 +256 @@
     orxout(internal_info, context::network) << "Server: added client id: " << peerID << endl;
 
-    createClient(peerID);
+    this->createClient(peerID);
   }
 
@@ -297 +276 @@
       }
     }
-
-    // TODO: What happens if no peer with this ID is found?
-    // Should probably at least log
 
     WANDiscoverable::updateClientNumber(this->clientIDs_.size());
@@ -339 +315 @@
 
     // synchronise class ids
-    syncClassid(clientID);
+    this->syncClassid(clientID);
 
     // now synchronise functionIDs
@@ -346 +322 @@
     bool b = fIDs->send(static_cast<Host*>(this));
     assert(b);
-    // TODO: assert probably isn't the way to go here, as a packet which fails to send will crash the game...
 
     GamestateManager::setSynched(clientID);
@@ -356 +331 @@
     b = w->send(static_cast<Host*>(this));
     assert(b);
-    // TODO: assert probably isn't the way to go here, as a packet which fails to send will crash the game...
 
     (void)b; // avoid compiler warning
@@ -380 +354 @@
   {
     // check if the target exists. just ignore the message otherwise
-    if (!this->isValidTarget(targetID)) // TODO: remove this if an invalid clientIDs don't trigger assertions anymore
+    if (!this->isValidTarget(targetID))
     {
       return;
@@ -434 +408 @@
     packet::ClassID *classid = new packet::ClassID();
     classid->setPeerID(clientID);
-    // TODO: Better to do this with a for loop
+
     int failures = 0;
     while(!classid->send(static_cast<Host*>(this)) && failures < 10)\
@@ -441 +415 @@
     }
     assert(failures<10);
-    // TODO: assert probably isn't the way to go here, as 10 failed packets will crash the game...
     orxout(verbose, context::network) << "syncClassid:\tall synchClassID packets have been sent" << endl;
   }