Changeset 7493 for code/trunk/src/orxonox/worldentities

Timestamp:

Sep 27, 2010, 7:53:30 PM (14 years ago)

Author:

dafrick

Message:

Fixing small bug in Script (regarding number of executions).
Fixed bug in WorldEntity, that caused the visibility and activity to be synchronized incorrectly (since bVisibleMem and bActiveMem are not synchronized).
Some small changed in documentation.
Started "synchronizing" pickups. Seems to work (except GUI), but haven't done any extensive testing yet.

File:

• code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/WorldEntity.cc

@@ -214 +214 @@
         SUPER(WorldEntity, changedActivity);
 
-        for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
-        {
-            if(!this->isActive())
-            {
-                (*it)->bActiveMem_ = (*it)->isActive();
-                (*it)->setActive(this->isActive());
-            }
-            else
-            {
-                (*it)->setActive((*it)->bActiveMem_);
+        if(GameMode::isMaster())
+        {
+            for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
+            {
+                if(!this->isActive())
+                {
+                    (*it)->bActiveMem_ = (*it)->isActive();
+                    (*it)->setActive(this->isActive());
+                }
+                else
+                {
+                    (*it)->setActive((*it)->bActiveMem_);
+                }
             }
         }
@@ -236 +239 @@
         SUPER(WorldEntity, changedVisibility);
 
-        for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
-        {
-            if(!this->isVisible())
-            {
-                (*it)->bVisibleMem_ = (*it)->isVisible();
-                (*it)->setVisible(this->isVisible());
-            }
-            else
-            {
-                (*it)->setVisible((*it)->bVisibleMem_);
+        if(GameMode::isMaster())
+        {
+            for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
+            {
+                if(!this->isVisible())
+                {
+                    (*it)->bVisibleMem_ = (*it)->isVisible();
+                    (*it)->setVisible(this->isVisible());
+                }
+                else
+                {
+                    (*it)->setVisible((*it)->bVisibleMem_);
+                }
             }
         }