Changeset 475 for code/branches/FICN

Timestamp:

Dec 12, 2007, 6:36:18 PM (17 years ago)

Author:

scheusso

Message:

some improvements in chatserver/client

Location:

code/branches/FICN/src/network

Files:

• CMakeLists.txt (modified) (4 diffs)
• ConnectionManager.h (modified) (2 diffs)
• PacketManager.h (modified) (1 diff)
• Server.h (modified) (1 diff)
• dummyserver3.cc (modified) (2 diffs)

code/branches/FICN/src/network/CMakeLists.txt

@@ -41 +41 @@
 TARGET_LINK_LIBRARIES( chatserver
   ${OGRE_LIBRARIES}
-  ${OIS_LIBRARIES}
   network
   core
@@ -50 +49 @@
 TARGET_LINK_LIBRARIES( chatclient
   ${OGRE_LIBRARIES}
-  ${OIS_LIBRARIES}
   network
   core
@@ -60 +58 @@
 TARGET_LINK_LIBRARIES( client
   ${OGRE_LIBRARIES}
-  ${OIS_LIBRARIES}
   network
   core
@@ -67 +64 @@
 TARGET_LINK_LIBRARIES( server
   ${OGRE_LIBRARIES}
-  ${OIS_LIBRARIES}
   network
   core

code/branches/FICN/src/network/ConnectionManager.h

@@ -15 +15 @@
 #include <iostream>
 #include <string>
-#include <map>
-#include <vector>
 // enet library for networking support
 #include <enet/enet.h>
@@ -24 +22 @@
 // headerfiles
 #include "ClientInformation.h"
-#include "ConnectionManager.h"
 #include "PacketBuffer.h"
 #include "PacketManager.h"

code/branches/FICN/src/network/PacketManager.h

@@ -62 +62 @@
   //two functions are note yet implemented!
   //virtual void processGamestate(GameState *state);
-  virtual void processChat( chat *data, int clientId);
-  virtual void processClassid( classid *cid);
+  void processChat( chat *data, int clientId);
+  void processClassid( classid *cid);
   //virtual void processAck( ack *data);
   

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

@@ -19 +19 @@
 #include "PacketManager.h"
 #include "GameStateManager.h"
-#include "enet/enet.h"
 #include "ClientInformation.h"
+//#include "enet/enet.h"
 //#include "NetworkFrameListener.h"
 

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

@@ -1 +1 @@
 #include <iostream>
+#include "PacketManager.h"
+//#include "PacketTypes.h"
 #include "Server.h"
-#include "PacketManager.h"
-#include "PacketTypes.h"
 
 namespace network{
@@ -28 +28 @@
   while(true){
     tick();
+    usleep(100);
   }
 }