Changeset 1250
- Timestamp:
- May 8, 2008, 3:02:13 PM (17 years ago)
- Location:
- code/branches/network3/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network3/src/network/ConnectionManager.cc
r1246 r1250 199 199 break; 200 200 } 201 usleep(100);201 // usleep(100); 202 202 //yield(); //TODO: find apropriate 203 203 } -
code/branches/network3/src/orxonox/Main.cc
r1056 r1250 75 75 { 76 76 try { 77 SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");77 //SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log"); 78 78 Orxonox* orx = Orxonox::getSingleton(); 79 79 -
code/branches/network3/src/orxonox/objects/SpaceShip.cc
r1245 r1250 104 104 this->setRotationAxis(1, 0, 0); 105 105 this->setStatic(false); 106 107 server_=false; 106 108 107 109 … … 337 339 XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode); 338 340 341 server_=true; // TODO: this is only a hack 339 342 SpaceShip::create(); 340 343 getFocus(); … … 535 538 } 536 539 537 if( !network::Client::getSingleton() || network::Client::getSingleton()->getShipID() == objectID){540 if( (network::Client::getSingleton() && network::Client::getSingleton()->getShipID() == objectID) || server_ ){ 538 541 COUT(4) << "steering our ship: " << objectID << " mkeyboard: " << mKeyboard << std::endl; 539 542 if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W)) -
code/branches/network3/src/orxonox/objects/SpaceShip.h
r1232 r1250 124 124 125 125 float emitterRate_; 126 127 bool server_; 126 128 }; 127 129 }
Note: See TracChangeset
for help on using the changeset viewer.