Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 28, 2006, 5:11:51 PM (18 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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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;
Note: See TracChangeset for help on using the changeset viewer.