Changeset 2437 for code/branches/objecthierarchy2/src/orxonox

Timestamp:

Dec 14, 2008, 3:00:37 AM (16 years ago)

Author:

landauf

Message:

There's a problem in the network engine causing a crash. It's somehow related to objects with object-mode 0x0 that were deleted and/or created on the server during the game.

I managed to avoid the crash by not setting the object-mode to 0x0 when running on the server. However there's more research to be done on this topic.

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
 {
@@ -61 +65 @@
         this->nearClipDistance_ = 1;
 
-        this->setObjectMode(0x0);
+// REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
+        if (!Core::isMaster()) //---------------------------------------------------------
+//----------------------------------------------------------------------------------------
+            this->setObjectMode(0x0);
 
         this->setConfigValues();
         this->configvaluecallback_changedNearClipDistance();
-
-//        this->requestFocus(); // ! HACK ! REMOVE THIS !
     }
 

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
 {
@@ -44 +48 @@
         this->bDrag_ = false;
 
-        this->setObjectMode(0x0);
+// REMOVE THIS AS SOON AS THE SERVER CAN HANDLE DESTRUCTION OF OBJECTS WITH OBJECTMODE 0x0
+        if (!Core::isMaster()) //---------------------------------------------------------
+//----------------------------------------------------------------------------------------
+            this->setObjectMode(0x0);
     }