Changeset 9656 in orxonox.OLD for trunk/src/world_entities/environments

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/world_entities/environments

Files:

• model_entity.cc (modified) (1 diff)
• water.cc (modified) (2 diffs)

trunk/src/world_entities/environments/model_entity.cc

@@ -36 +36 @@
   this->speed = NULL;
   this->momentum = NULL;
+
+  this->setSynchronized(true);
 
   if (root != NULL)

trunk/src/world_entities/environments/water.cc

@@ -59 +59 @@
   // To test the Wave equation
   //this->wave(5.0,4.0, 1, 10);
-  
-  height_handle = registerVarId( new SynchronizeableFloat( &height, &height, "height" ) );
-  resX_handle = registerVarId( new SynchronizeableUInt( &resX, &resX, "resX" ) );
-  resY_handle = registerVarId( new SynchronizeableUInt( &resY, &resY, "resY" ) );
-  sizeX_handle = registerVarId( new SynchronizeableFloat( &sizeX, &sizeX, "sizeX" ) );
-  sizeY_handle = registerVarId( new SynchronizeableFloat( &sizeY, &sizeY, "sizeY" ) );
+
+  height_handle = registerVarId( new SynchronizeableFloat( &height, &height, "height", PERMISSION_MASTER_SERVER ) );
+  resX_handle = registerVarId( new SynchronizeableUInt( &resX, &resX, "resX", PERMISSION_MASTER_SERVER ) );
+  resY_handle = registerVarId( new SynchronizeableUInt( &resY, &resY, "resY", PERMISSION_MASTER_SERVER ) );
+  sizeX_handle = registerVarId( new SynchronizeableFloat( &sizeX, &sizeX, "sizeX", PERMISSION_MASTER_SERVER ) );
+  sizeY_handle = registerVarId( new SynchronizeableFloat( &sizeY, &sizeY, "sizeY", PERMISSION_MASTER_SERVER ) );
 }
 
@@ -313 +313 @@
     this->rebuildGrid();
   }
-  
+
   WorldEntity::varChangeHandler( id );
 }