Changeset 1748 for code/branches/network/src/orxonox

Timestamp:

Sep 9, 2008, 11:23:40 AM (16 years ago)

Author:

scheusso

Message:

backsync should now work correctly (server can move again )

Location:

code/branches/network/src/orxonox/objects

Files:

• Model.cc (modified) (1 diff)
• SpaceShip.cc (modified) (3 diffs)

code/branches/network/src/orxonox/objects/Model.cc

@@ -45 +45 @@
     CreateFactory(Model);
 
+    /**
+     * 
+     */
     Model::Model()
     {
         RegisterObject(Model);
         registerAllVariables();
+        if(this->isExactlyA(Class(Model)))
+           setObjectFrequency(1);
     }
 

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

@@ -166 +166 @@
         if(network::Host::running())
           COUT(3) << "this id: " << this->objectID << " myShipID: " << network::Host::getShipID() << std::endl;
-        if(network::Host::running() && objectID == network::Host::getShipID())
+        if(network::Host::running() && objectID == network::Host::getShipID()){
+          setObjectMode(0x3);
           myShip_=true;
+        }
         else
           this->setRadarObjectColour(this->getProjectileColour());
@@ -360 +362 @@
       if(myShip_){
         COUT(3) << "requesting focus for camera" << std::endl;
-        this->setBacksync(true);
         //CameraHandler::getInstance()->requestFocus(cam_);
         if(this->isExactlyA(Class(SpaceShip))){
@@ -466 +467 @@
             }
 
-            projectile->setBacksync(true);
+            projectile->setObjectMode(0x3);
             this->timeToReload_ = this->reloadTime_;
         }