Changeset 436 for code/branches/FICN/src/network/Server.cc

Timestamp:

Dec 9, 2007, 12:42:46 PM (16 years ago)

Author:

scheusso

Message:

extended gamestatehandling for diffed and not diffed gamestates (initial states, etc)

File:

• code/branches/FICN/src/network/Server.cc (modified) (9 diffs)

code/branches/FICN/src/network/Server.cc

@@ -21 +21 @@
    */
   Server::Server(){
-    connection = ConnectionManager();
-    gamestates = GameStateManager();
     packet_gen = PacketGenerator();
+    clients = new ClientInformation();
+    connection = new ConnectionManager(clients);
+    gamestates = new GameStateManager(clients);
   }
 
@@ -32 +33 @@
    */
   Server::Server(int port, std::string bindAddress){
-    connection = ConnectionManager(port, bindAddress);
-    gamestates = GameStateManager();
     packet_gen = PacketGenerator();
+    clients = new ClientInformation();
+    connection = new ConnectionManager(port, bindAddress, clients);
+    gamestates = new GameStateManager(clients);
   }
 
@@ -43 +45 @@
    */
   Server::Server(int port, const char *bindAddress){
-    connection = ConnectionManager(port, bindAddress);
-    gamestates = GameStateManager();
     packet_gen = PacketGenerator();
+    clients = new ClientInformation();
+    connection = new ConnectionManager(port, bindAddress, clients);
+    gamestates = new GameStateManager(clients);
   }
   
@@ -52 +55 @@
    */
   void Server::open(){
-    connection.createListener();
+    connection->createListener();
     return;
   }
@@ -60 +63 @@
    */
   void Server::close(){
-    connection.quitListener();
+    connection->quitListener();
     return;
   }
@@ -71 +74 @@
   bool Server::sendMSG(std::string msg){
     ENetPacket *packet = packet_gen.chatMessage(msg.c_str());
-    connection.addPacketAll(packet);
-    return connection.sendPackets();
+    connection->addPacketAll(packet);
+    return connection->sendPackets();
   }
   /**
@@ -81 +84 @@
   bool Server::sendMSG(const char *msg){
     ENetPacket *packet = packet_gen.chatMessage(msg);
-    connection.addPacketAll(packet);
-    return connection.sendPackets();
+    connection->addPacketAll(packet);
+    return connection->sendPackets();
   }
   
@@ -101 +104 @@
     ENetPacket *packet;
     int clientID=-1;
-    while(!connection.queueEmpty()){
-      packet = connection.getPacket(clientID);
+    while(!connection->queueEmpty()){
+      packet = connection->getPacket(clientID);
       elaborate(packet, clientID);
     }
@@ -111 +114 @@
    */
   void Server::updateGamestate(){
-    gamestates.update();
+    gamestates->update();
     sendGameState();
   }