Changeset 2449 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities

Timestamp:

Dec 14, 2008, 9:36:26 PM (16 years ago)

Author:

landauf

Message:

removed temporary workaround in Camera and CameraPosition thanks to Oli's changes in r2441

Location:

code/branches/objecthierarchy2/src/orxonox/objects/worldentities

Files:

• Camera.cc (modified) (2 diffs)
• CameraPosition.cc (modified) (2 diffs)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc

@@ -43 +43 @@
 #include "CameraManager.h"
 
-// REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
-#include "core/Core.h" //--------------------------------------
-//----------------------------------------------------------------------------------------
-
 namespace orxonox
 {
@@ -65 +61 @@
         this->nearClipDistance_ = 1;
 
-// REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
-        if (!Core::isMaster()) //---------------------------------------------------------
-//----------------------------------------------------------------------------------------
-            this->setObjectMode(0x0);
+        this->setObjectMode(0x0);
 
         this->setConfigValues();

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.cc

@@ -34 +34 @@
 #include "Camera.h"
 
-// REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
-#include "core/Core.h" //--------------------------------------
-//----------------------------------------------------------------------------------------
-
 namespace orxonox
 {
@@ -48 +44 @@
         this->bDrag_ = false;
 
-// REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
-        if (!Core::isMaster()) //---------------------------------------------------------
-//----------------------------------------------------------------------------------------
-            this->setObjectMode(0x0);
+        this->setObjectMode(0x0);
     }