Changeset 6327 for code/branches/presentation2/src/orxonox/sound/BaseSound.cc

Timestamp:

Dec 12, 2009, 5:45:57 PM (14 years ago)

Author:

rgrieder

Message:

Engine synchronisation seems to work more or less.
Fire sound still doesn't work on client.

File:

• code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) (3 diffs)

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -200 +200 @@
     void BaseSound::setSource(const std::string& source)
     {
-        if (!GameMode::playsSound() || source == this->source_) 
+        if (!GameMode::playsSound())
         {
             this->source_ = source;
@@ -208 +208 @@
         if (this->soundBuffer_ != NULL)
         {
+            if (this->soundBuffer_->getFilename() == source)
+            {
+                assert(this->source_ == source_);
+                return;
+            }
             // Stopping is imperative here!
             if (alIsSource(this->audioSource_))
@@ -248 +253 @@
     void BaseSound::stateChanged()
     {
-        CCOUT(0) << "changed state to " << this->state_ << endl;
-        switch( this->state_ )
+        switch (this->state_)
         {
             case Playing: