Changeset 1291 for code/branches/merge/src

Timestamp:

May 15, 2008, 5:18:08 PM (17 years ago)

Author:

scheusso

Message:

some changes got lost(camera)

Location:

code/branches/merge/src

Files:

• network/Synchronisable.cc (modified) (1 diff)
• orxonox/objects/Camera.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)

code/branches/merge/src/network/Synchronisable.cc

@@ -56 +56 @@
   * calls registarAllVariables, that has to be implemented by the inheriting classID
   */
-  Synchronisable::Synchronisable(){
+  Synchronisable::Synchronisable():
+      backsync_(false),
+      datasize(0) {
     RegisterRootObject(Synchronisable);
     static int idCounter=0;
-    datasize=0;
     objectID=idCounter++;
     syncList = new std::list<synchronisableVariable *>;

code/branches/merge/src/orxonox/objects/Camera.cc

@@ -60 +60 @@
   {
     CameraHandler::getInstance()->releaseFocus(this);
+    GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->removeAndDestroyChild(cameraNode_->getName());
   }
 

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

@@ -147 +147 @@
     void SpaceShip::init()
     {
-    if ((server_ || ( network::Client::getSingleton() && network::Client::getSingleton()->getShipID()==objectID ) ))
-    {
-          if (!setMouseEventCallback_)
-          {
-              InputManager::addMouseHandler(this, "SpaceShip");
-              setMouseEventCallback_ = true;
-          }
-    }
+        if ((server_ || ( network::Client::getSingleton() && network::Client::getSingleton()->getShipID()==objectID ) ))
+        {
+              if (!setMouseEventCallback_)
+              {
+                  InputManager::addMouseHandler(this, "SpaceShip");
+                  setMouseEventCallback_ = true;
+              }
+        }
 
         // START CREATING THRUSTER