Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6815 in orxonox.OLD for trunk/src/world_entities/power_ups


Ignore:
Timestamp:
Jan 28, 2006, 5:11:51 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/network back to the trunk.
merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/network . -r6774:HEAD

no conflicts…
thats what i call orthogonal work

Location:
trunk/src/world_entities/power_ups
Files:
5 edited

Legend:

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

    r6780 r6815  
    127127  SYNCHELP_READ_BEGIN();
    128128
    129   SYNCHELP_READ_FKT( PowerUp::writeState );
     129  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_LPU_WE_STATE );
    130130
    131131  return SYNCHELP_READ_N;
     
    149149    SYNCHELP_WRITE_BEGIN();
    150150
    151     SYNCHELP_WRITE_FKT( PowerUp::readState );
     151    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_LPU_WE_STATE );
    152152
    153153    return SYNCHELP_WRITE_N;
  • trunk/src/world_entities/power_ups/param_power_up.cc

    r6695 r6815  
    131131  SYNCHELP_READ_BEGIN();
    132132
    133   SYNCHELP_READ_FKT( PowerUp::writeState );
     133  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_PPU_WE_STATE );
    134134
    135135  int i;
    136   SYNCHELP_READ_INT( i );
     136  SYNCHELP_READ_INT( i, NWT_PPU_TYPE );
    137137  this->type = (EnumParamPowerUpType)i;
    138   SYNCHELP_READ_FLOAT( this->value );
     138  SYNCHELP_READ_FLOAT( this->value, NWT_PPU_VALUE );
    139139
    140140  if ( this->value != 0 )
    141141  {
    142     SYNCHELP_READ_FLOAT( this->min_value );
    143     SYNCHELP_READ_FLOAT( this->max_value );
     142    SYNCHELP_READ_FLOAT( this->min_value, NWT_PPU_MINVALUE );
     143    SYNCHELP_READ_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
    144144    respawn();
    145145  }
     
    165165    SYNCHELP_WRITE_BEGIN();
    166166
    167     SYNCHELP_WRITE_FKT( PowerUp::readState );
     167    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_PPU_WE_STATE );
    168168
    169169    int i = (int)this->type;
    170     SYNCHELP_WRITE_INT( i );
    171     SYNCHELP_WRITE_FLOAT( this->value );
     170    SYNCHELP_WRITE_INT( i, NWT_PPU_TYPE );
     171    SYNCHELP_WRITE_FLOAT( this->value, NWT_PPU_VALUE );
    172172
    173173    if ( this->value != 0 )
    174174    {
    175       SYNCHELP_WRITE_FLOAT( this->min_value );
    176       SYNCHELP_WRITE_FLOAT( this->max_value );
     175      SYNCHELP_WRITE_FLOAT( this->min_value, NWT_PPU_MINVALUE );
     176      SYNCHELP_WRITE_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
    177177    }
    178178
  • trunk/src/world_entities/power_ups/power_up.cc

    r6710 r6815  
    2020#include "extendable.h"
    2121#include "primitive_model.h"
     22
     23#include "assert.h"
    2224
    2325using namespace std;
     
    124126{
    125127  SYNCHELP_WRITE_BEGIN();
    126   SYNCHELP_WRITE_FKT( WorldEntity::readState );
     128  SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_PU_WE_STATE );
    127129  return SYNCHELP_WRITE_N;
    128130}
     
    138140{
    139141  SYNCHELP_READ_BEGIN();
    140   SYNCHELP_READ_FKT( WorldEntity::writeState );
     142  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_PU_WE_STATE );
    141143  return SYNCHELP_READ_N;
    142144}
  • trunk/src/world_entities/power_ups/turret_power_up.cc

    r6780 r6815  
    136136  SYNCHELP_READ_BEGIN();
    137137
    138   SYNCHELP_READ_FKT( PowerUp::writeState );
     138  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_TPU_WE_STATE );
    139139
    140140  return SYNCHELP_READ_N;
     
    157157    SYNCHELP_WRITE_BEGIN();
    158158
    159     SYNCHELP_WRITE_FKT( PowerUp::readState );
     159    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_TPU_WE_STATE );
    160160
    161161    return SYNCHELP_WRITE_N;
  • trunk/src/world_entities/power_ups/weapon_power_up.cc

    r6710 r6815  
    100100  SYNCHELP_READ_BEGIN();
    101101
    102   SYNCHELP_READ_FKT( PowerUp::writeState );
     102  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_WPU_WE_STATE );
    103103
    104104  //TODO: sync weapon class ( see loadParams )
     
    124124    SYNCHELP_WRITE_BEGIN();
    125125
    126     SYNCHELP_WRITE_FKT( PowerUp::readState );
     126    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_WPU_WE_STATE );
    127127
    128128    //TODO: sync weapon class ( see loadParams )
Note: See TracChangeset for help on using the changeset viewer.