Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6695 in orxonox.OLD for trunk/src/orxonox.cc


Ignore:
Timestamp:
Jan 25, 2006, 2:39:53 PM (18 years ago)
Author:
patrick
Message:

merged the network branche to the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/orxonox.cc

    r6426 r6695  
    5656
    5757#include "network_manager.h"
     58
     59#include "state.h"
    5860
    5961#include <string.h>
     
    276278
    277279  if( this->serverName != NULL) // we are a client
     280  {
     281    State::setOnline(true);
    278282    NetworkManager::getInstance()->establishConnection(this->serverName, port);
     283  }
    279284  else if( this->port > 0) {    // we are a server
     285    State::setOnline(true);
    280286    NetworkManager::getInstance()->createServer(port);
    281287  }
    282 
    283288  return 0;
    284289}
Note: See TracChangeset for help on using the changeset viewer.