Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 4, 2006, 11:01:28 PM (18 years ago)
Author:
bensch
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/power_ups/param_power_up.cc

    r9406 r9656  
    4343  if( root != NULL)
    4444    this->loadParams(root);
    45  
    46   registerVar( new SynchronizeableInt( (int*)&type, (int*)&type, "type" ) );
    47   registerVar( new SynchronizeableFloat( &value, &value, "value" ) );
    48   registerVar( new SynchronizeableFloat( &max_value, &max_value, "max_value" ) );
    49   registerVar( new SynchronizeableFloat( &min_value, &min_value, "min_value" ) );
     45
     46  registerVar( new SynchronizeableInt( (int*)&type, (int*)&type, "type", PERMISSION_MASTER_SERVER ) );
     47  registerVar( new SynchronizeableFloat( &value, &value, "value", PERMISSION_MASTER_SERVER ) );
     48  registerVar( new SynchronizeableFloat( &max_value, &max_value, "max_value", PERMISSION_MASTER_SERVER ) );
     49  registerVar( new SynchronizeableFloat( &min_value, &min_value, "min_value", PERMISSION_MASTER_SERVER ) );
    5050}
    5151
Note: See TracChangeset for help on using the changeset viewer.