Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1250


Ignore:
Timestamp:
May 8, 2008, 3:02:13 PM (17 years ago)
Author:
scheusso
Message:

memory free problem

Location:
code/branches/network3/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/network3/src/network/ConnectionManager.cc

    r1246 r1250  
    199199          break;
    200200      }
    201       usleep(100);
     201//       usleep(100);
    202202      //yield(); //TODO: find apropriate
    203203    }
  • code/branches/network3/src/orxonox/Main.cc

    r1056 r1250  
    7575{
    7676  try {
    77     SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
     77    //SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
    7878    Orxonox* orx = Orxonox::getSingleton();
    7979
  • code/branches/network3/src/orxonox/objects/SpaceShip.cc

    r1245 r1250  
    104104        this->setRotationAxis(1, 0, 0);
    105105        this->setStatic(false);
     106       
     107        server_=false;
    106108
    107109
     
    337339        XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode);
    338340       
     341        server_=true; // TODO: this is only a hack
    339342        SpaceShip::create();
    340343        getFocus();
     
    535538        }
    536539
    537         if(!network::Client::getSingleton() || network::Client::getSingleton()->getShipID() == objectID){
     540        if( (network::Client::getSingleton() &&  network::Client::getSingleton()->getShipID() == objectID) || server_ ){
    538541          COUT(4) << "steering our ship: " << objectID << " mkeyboard: " << mKeyboard << std::endl;
    539542          if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
  • code/branches/network3/src/orxonox/objects/SpaceShip.h

    r1232 r1250  
    124124
    125125            float emitterRate_;
     126           
     127            bool server_;
    126128    };
    127129}
Note: See TracChangeset for help on using the changeset viewer.