Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6457


Ignore:
Timestamp:
Jan 23, 2010, 4:38:41 PM (14 years ago)
Author:
scheusso
Message:

changed synchronisation of worldsound state (1 instead of 4 bytes)
fix in Synchronisable::unregisterVariable

Location:
code/branches/network2/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h

    r6455 r6457  
    225225    while(it!=syncList_.end()){
    226226      if( ((*it)->getReference()) == &variable ){
     227        this->dataSize_ -= (*it)->getSize(Synchronisable::state_);
    227228        delete (*it);
    228229        syncList_.erase(it);
  • code/branches/network2/src/orxonox/sound/BaseSound.cc

    r6417 r6457  
    248248        else // No source acquired so far, but might be set to playing or paused
    249249        {
    250             State state = this->state_; // save
     250            State state = static_cast<State>(this->state_); // save
    251251            if (this->isPlaying() || this->isPaused())
    252252                doPlay();
  • code/branches/network2/src/orxonox/sound/BaseSound.h

    r6417 r6457  
    112112        float           volume_;
    113113        bool            bLooping_;
    114         State           state_;
     114        uint8_t         state_;       // This Variable is actually of type State
    115115        float           pitch_;
    116116
  • code/branches/network2/src/orxonox/sound/WorldSound.cc

    r6417 r6457  
    5858        registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::loopingChanged));
    5959        registerVariable(pitch_,    ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::pitchChanged));
    60         registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::stateChanged));
     60        registerVariable((uint8_t&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::stateChanged));
    6161    }
    6262
Note: See TracChangeset for help on using the changeset viewer.