Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 298


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/merger/CMakeLists.txt

    r297 r298  
    55#Create some verbose output
    66SET(CMAKE_VERBOSE_MAKEFILE TRUE)
     7
     8# set eNet search path
     9SET(Boost_INCLUDE_DIR "/usr/include/boost/")
    710
    811#force-set the compile on tardis machines, as default points to g++-3.3
     
    3134  MESSAGE("System is a TARDIS: Setting Compiler to g++-3.4.3")
    3235  SET(CMAKE_CXX_COMPILER "g++-3.4.3")
    33 
     36# reset eNet serach path
    3437  SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
    3538  ENDIF(IS_TARDIS)
     
    5053LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS})
    5154#Sets the search path for include files
    52 #INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} -I/usr/include/enet)
    5355INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
    5456
  • code/branches/merger/src/network/ClientConnection.cc

    r297 r298  
    132132  bool ClientConnection::disconnectConnection(){
    133133    ENetEvent event;
    134     enet_peer_disconnect(server);
    135     //enet_peer_disconnect(server, 0);
     134//     enet_peer_disconnect(server);
     135    enet_peer_disconnect(server, 0);
    136136    while(enet_host_service(client, &event, NETWORK_WAIT_TIMEOUT) > 0){
    137137      switch (event.type)
  • code/branches/merger/src/network/dummyclient.cc

    r297 r298  
    7171
    7272        // now disconnect
    73   enet_peer_disconnect (peer);
    74 //  enet_peer_disconnect (peer, 0);
     73//   enet_peer_disconnect (peer);
     74  enet_peer_disconnect (peer, 0);
    7575        // 3 seconds timeout
    7676  while(enet_host_service(client, &event, 3000) > 0){
Note: See TracChangeset for help on using the changeset viewer.