Changeset 8741 for code/branches/ai2/src/orxonox/worldentities

Timestamp:

Jul 10, 2011, 9:53:17 PM (13 years ago)

Author:

jo

Message:

Correction of camera bug.

File:

• code/branches/ai2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)

code/branches/ai2/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -326 +326 @@
     void SpaceShip::resetCamera()
     {
-        Camera *camera = this->getCamera();
-
-        if (camera == 0)
-        {
-            COUT(2) << "Failed to reset camera!";
-            return;
-        }
-    
-        this->shakeDt_ = 0;
-        camera->setPosition(this->cameraOriginalPosition_);
-        camera->setOrientation(this->cameraOriginalOrientation_);
+        if(this->hasLocalController() && this->hasHumanController())
+        {
+            Camera *camera = this->getCamera();
+
+            if (camera == 0)
+            {
+                COUT(2) << "Failed to reset camera!";
+                return;
+            }
+    
+            this->shakeDt_ = 0;
+            camera->setPosition(this->cameraOriginalPosition_);
+            camera->setOrientation(this->cameraOriginalOrientation_);
+        }
     }