Changeset 2134 for code/branches

Timestamp:

Nov 4, 2008, 7:14:07 PM (16 years ago)

Author:

scheusso

Message:

reverted some changes for synchronisation of controllableentity

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -250 +250 @@
         REGISTERSTRING(this->cameraPositionTemplate_, direction::toclient);
 
-        REGISTERDATA(this->server_overwrite_,   direction::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processOverwrite));
         REGISTERDATA(this->client_overwrite_,   direction::toserver);
         
@@ -256 +255 @@
         REGISTERDATA(this->server_velocity_,    direction::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerVelocity));
         REGISTERDATA(this->server_orientation_, direction::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerOrientation));
+        REGISTERDATA(this->server_overwrite_,   direction::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processOverwrite));
 
         REGISTERDATA(this->client_position_,    direction::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientPosition));