Changeset 9625 in orxonox.OLD for branches/proxy/src/world_entities

Timestamp:

Jul 30, 2006, 11:19:24 PM (18 years ago)

Author:

patrick

Message:

yet another weekend commit, quite much work done:

• introduced a new PERMISSION layer: PERMISSION_SERVER: the nearest server hast authority
• tightening up permissions: brand new implementation to prevent sending unused variables in the network (less smog in the net:D_
• removed some compiler warnings from some central modules
• networkmonitor interface changed to work with networknodes mainly
• better debug output for the network monitor
• networnode inteface standardisation
• force reconnection commands integration

Location:

branches/proxy/src/world_entities

Files:

• bsp_entity.cc (modified) (1 diff)
• environments/water.cc (modified) (2 diffs)
• npcs/network_turret.cc (modified) (1 diff)
• npcs/space_turret.cc (modified) (1 diff)
• playable.cc (modified) (1 diff)
• power_ups/param_power_up.cc (modified) (1 diff)
• skybox.cc (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

branches/proxy/src/world_entities/bsp_entity.cc

@@ -54 +54 @@
   this->bspManager = NULL;
 
-  this->name_handle = registerVarId( new SynchronizeableString( &this->name, &this->name_write, "name" ) );
+  this->name_handle = registerVarId( new SynchronizeableString( &this->name, &this->name_write, "name", PERMISSION_MASTER_SERVER ) );
 
   this->setSynchronized( true );

branches/proxy/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 );
 }

branches/proxy/src/world_entities/npcs/network_turret.cc

@@ -84 +84 @@
   this->targetGroup = OM_GROUP_01;
   this->targetGroup_write = OM_GROUP_01;
-  this->targetGroup_handle = this->registerVarId( new SynchronizeableInt ( &targetGroup, &targetGroup_write, "targetgroup" ) );
+  this->targetGroup_handle = this->registerVarId( new SynchronizeableInt ( &targetGroup, &targetGroup_write, "targetgroup", PERMISSION_MASTER_SERVER ) );
 
   this->setSynchronized( true );

branches/proxy/src/world_entities/npcs/space_turret.cc

@@ -75 +75 @@
   this->weaponHolder[1].setParent(this);
 
-  this->wLeftHandle = registerVarId( new SynchronizeableString( &this->wLeft, &this->wLeft, "weapon-left" ) );
-  this->wRightHandle = registerVarId( new SynchronizeableString( &this->wRight, &this->wRight, "weapon-right" ) );
+  this->wLeftHandle = registerVarId( new SynchronizeableString( &this->wLeft, &this->wLeft, "weapon-left", PERMISSION_MASTER_SERVER ) );
+  this->wRightHandle = registerVarId( new SynchronizeableString( &this->wRight, &this->wRight, "weapon-right", PERMISSION_MASTER_SERVER ) );
 
 }

branches/proxy/src/world_entities/playable.cc

@@ -68 +68 @@
 
 
-  this->teamChangeHandler = registerVarId( new SynchronizeableInt( &this->teamId, &this->teamId, "team-id" ) );
-  registerVar( new SynchronizeableInt( &score, &score, "score" ) );
+  this->teamChangeHandler = registerVarId( new SynchronizeableInt( &this->teamId, &this->teamId, "team-id", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableInt( &score, &score, "score", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));
 }

branches/proxy/src/world_entities/power_ups/param_power_up.cc

@@ -43 +43 @@
   if( root != NULL)
     this->loadParams(root);
-  
-  registerVar( new SynchronizeableInt( (int*)&type, (int*)&type, "type" ) );
-  registerVar( new SynchronizeableFloat( &value, &value, "value" ) );
-  registerVar( new SynchronizeableFloat( &max_value, &max_value, "max_value" ) );
-  registerVar( new SynchronizeableFloat( &min_value, &min_value, "min_value" ) );
+
+  registerVar( new SynchronizeableInt( (int*)&type, (int*)&type, "type", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableFloat( &value, &value, "value", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableFloat( &max_value, &max_value, "max_value", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableFloat( &min_value, &min_value, "min_value", PERMISSION_MASTER_SERVER ) );
 }
 

branches/proxy/src/world_entities/skybox.cc

@@ -96 +96 @@
 {
   this->rebuild();
-  
-  textureName_handle = registerVarId( new SynchronizeableString( &textureName, &textureName, "textureName") );
-  size_handle = registerVarId( new SynchronizeableFloat( &size, &size, "size" ) );
+
+  textureName_handle = registerVarId( new SynchronizeableString( &textureName, &textureName, "textureName", PERMISSION_MASTER_SERVER) );
+  size_handle = registerVarId( new SynchronizeableFloat( &size, &size, "size", PERMISSION_MASTER_SERVER ) );
 }
 
@@ -297 +297 @@
 {
   bool somethinChanged = false;
-  
+
   if ( std::find( id.begin(), id.end(), textureName_handle ) != id.end() )
   {
@@ -303 +303 @@
     setTexture( textureName );
   }
-  
+
   if ( std::find( id.begin(), id.end(), size_handle ) != id.end() )
   {
     somethinChanged = true;
   }
-  
+
   rebuild();
-  
+
   WorldEntity::varChangeHandler( id );
 }

branches/proxy/src/world_entities/space_ships/space_ship.cc

@@ -234 +234 @@
   this->burstSystem->setColor(1.0, .8,.8,.8,.0);
 
-  registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity" ) );
+  registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mousedir", PERMISSION_OWNER ) );
 

branches/proxy/src/world_entities/world_entity.cc

@@ -85 +85 @@
   this->toList(OM_NULL);
 
-  registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName" ) );
-  modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
-  scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling" ) );
-  list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list" ) );
-
-  health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health" ) );
-  healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth" ) );
+  registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName", PERMISSION_MASTER_SERVER ) );
+  modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName", PERMISSION_MASTER_SERVER ) );
+  scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling", PERMISSION_MASTER_SERVER ) );
+  list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list", PERMISSION_MASTER_SERVER ) );
+
+  health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health", PERMISSION_MASTER_SERVER ) );
+  healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth", PERMISSION_MASTER_SERVER ) );
 }