Changeset 298 for code/branches/merger

Timestamp:

Nov 28, 2007, 1:41:53 AM (17 years ago)

Author:

nicolasc

Message:

some cleanups
eNet code is currently enet-1.1 compatible (incompatible enet-1.0!)

Location:

code/branches/merger

Files:

• CMakeLists.txt (modified) (3 diffs)
• src/network/ClientConnection.cc (modified) (1 diff)
• src/network/dummyclient.cc (modified) (1 diff)

code/branches/merger/CMakeLists.txt

@@ -5 +5 @@
 #Create some verbose output
 SET(CMAKE_VERBOSE_MAKEFILE TRUE)
+
+# set eNet search path
+SET(Boost_INCLUDE_DIR "/usr/include/boost/")
 
 #force-set the compile on tardis machines, as default points to g++-3.3
@@ -31 +34 @@
   MESSAGE("System is a TARDIS: Setting Compiler to g++-3.4.3")
   SET(CMAKE_CXX_COMPILER "g++-3.4.3")
-
+# reset eNet serach path
   SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
   ENDIF(IS_TARDIS)
@@ -50 +53 @@
 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS})
 #Sets the search path for include files
-#INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} -I/usr/include/enet)
 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
 

code/branches/merger/src/network/ClientConnection.cc

@@ -132 +132 @@
   bool ClientConnection::disconnectConnection(){
     ENetEvent event;
-    enet_peer_disconnect(server);
-    //enet_peer_disconnect(server, 0);
+//     enet_peer_disconnect(server);
+    enet_peer_disconnect(server, 0);
     while(enet_host_service(client, &event, NETWORK_WAIT_TIMEOUT) > 0){
       switch (event.type)

code/branches/merger/src/network/dummyclient.cc

@@ -71 +71 @@
 
         // now disconnect
-  enet_peer_disconnect (peer);
-//  enet_peer_disconnect (peer, 0);
+//   enet_peer_disconnect (peer);
+  enet_peer_disconnect (peer, 0);
         // 3 seconds timeout
   while(enet_host_service(client, &event, 3000) > 0){