Changeset 1250 for code/branches/network3/src

Timestamp:

May 8, 2008, 3:02:13 PM (17 years ago)

Author:

scheusso

Message:

memory free problem

Location:

code/branches/network3/src

Files:

• network/ConnectionManager.cc (modified) (1 diff)
• orxonox/Main.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (3 diffs)
• orxonox/objects/SpaceShip.h (modified) (1 diff)

code/branches/network3/src/network/ConnectionManager.cc

@@ -199 +199 @@
           break;
       }
-      usleep(100);
+//       usleep(100);
       //yield(); //TODO: find apropriate
     }

code/branches/network3/src/orxonox/Main.cc

@@ -75 +75 @@
 {
   try {
-    SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
+    //SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
     Orxonox* orx = Orxonox::getSingleton();
 

code/branches/network3/src/orxonox/objects/SpaceShip.cc

@@ -104 +104 @@
         this->setRotationAxis(1, 0, 0);
         this->setStatic(false);
+        
+        server_=false;
 
 
@@ -337 +339 @@
         XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode);
         
+        server_=true; // TODO: this is only a hack
         SpaceShip::create();
         getFocus();
@@ -535 +538 @@
         }
 
-        if(!network::Client::getSingleton() || network::Client::getSingleton()->getShipID() == objectID){
+        if( (network::Client::getSingleton() &&  network::Client::getSingleton()->getShipID() == objectID) || server_ ){
           COUT(4) << "steering our ship: " << objectID << " mkeyboard: " << mKeyboard << std::endl;
           if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))

code/branches/network3/src/orxonox/objects/SpaceShip.h

@@ -124 +124 @@
 
             float emitterRate_;
+            
+            bool server_;
     };
 }