- Timestamp:
- Jan 23, 2010, 4:38:41 PM (15 years ago)
- Location:
- code/branches/network2/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network2/src/libraries/network/synchronisable/Synchronisable.h
r6455 r6457 225 225 while(it!=syncList_.end()){ 226 226 if( ((*it)->getReference()) == &variable ){ 227 this->dataSize_ -= (*it)->getSize(Synchronisable::state_); 227 228 delete (*it); 228 229 syncList_.erase(it); -
code/branches/network2/src/orxonox/sound/BaseSound.cc
r6417 r6457 248 248 else // No source acquired so far, but might be set to playing or paused 249 249 { 250 State state = this->state_; // save250 State state = static_cast<State>(this->state_); // save 251 251 if (this->isPlaying() || this->isPaused()) 252 252 doPlay(); -
code/branches/network2/src/orxonox/sound/BaseSound.h
r6417 r6457 112 112 float volume_; 113 113 bool bLooping_; 114 State state_;114 uint8_t state_; // This Variable is actually of type State 115 115 float pitch_; 116 116 -
code/branches/network2/src/orxonox/sound/WorldSound.cc
r6417 r6457 58 58 registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::loopingChanged)); 59 59 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)); 61 61 } 62 62
Note: See TracChangeset
for help on using the changeset viewer.