Hexen: Fixed missing pottery explode sound

The pottery explode sound was using the pottery mobj as origin, which meant that because the origin was immediately destroyed, the sound was also stopped right away. The sf_dontstop flag prevents the sound from being stopped in this situation.
skyjake · Jan 3, 2012 · a01e999 · a01e999
1 parent 15f3801
commit a01e999
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/doomsday/engine/portable/src/s_sfx.c b/doomsday/engine/portable/src/s_sfx.c
@@ -696,6 +696,9 @@ int Sfx_StartSound(sfxsample_t* sample, float volume, float freq,
                  * The new sound can't be played because we were unable to
                  * stop enough channels to accommodate the limitation.
                  */
+#ifdef _DEBUG
+                Con_Message("Sfx_StartSound: Not playing %i because channels are busy.\n", sample->id);
+#endif
                 return false;
             }
 
@@ -782,6 +785,9 @@ int Sfx_StartSound(sfxsample_t* sample, float volume, float freq,
     if(!selCh)
     {   // A suitable channel was not found.
         END_COP;
+#ifdef _DEBUG
+        Con_Message("Sfx_StartSound: Failed to find suitable channel for sample %i.\n", sample->id);
+#endif
         return false;
     }
 
@@ -804,8 +810,7 @@ int Sfx_StartSound(sfxsample_t* sample, float volume, float freq,
         selCh->buffer->flags |= SFXBF_DONT_STOP;
 
     // Init the channel information.
-    selCh->flags &=
-        ~(SFXCF_NO_ORIGIN | SFXCF_NO_ATTENUATION | SFXCF_NO_UPDATE);
+    selCh->flags &= ~(SFXCF_NO_ORIGIN | SFXCF_NO_ATTENUATION | SFXCF_NO_UPDATE);
     selCh->volume = volume;
     selCh->frequency = freq;
     if(!emitter && !fixedPos)
@@ -825,7 +830,6 @@ int Sfx_StartSound(sfxsample_t* sample, float volume, float freq,
         selCh->flags |= SFXCF_NO_ATTENUATION;
     }
 
-
     /**
      * Load in the sample. Must load prior to setting properties, because
      * the audioDriver might actually create the real buffer only upon loading.

diff --git a/doomsday/engine/portable/src/sv_sound.c b/doomsday/engine/portable/src/sv_sound.c
@@ -127,8 +127,8 @@ void Sv_SoundAtVolume(int soundIDAndFlags, mobj_t *origin, float volume,
     }
 
 #ifdef _DEBUG
-    VERBOSE( Con_Message("Sv_SoundAtVolume: Id=%i, vol=%g, targets=%x\n",
-                         soundID, volume, targetPlayers) );
+    VERBOSE2( Con_Message("Sv_SoundAtVolume: Id=%i, vol=%g, targets=%x\n",
+                          soundID, volume, targetPlayers) );
 #endif
 
     Sv_NewSoundDelta(soundID, origin, sector, poly, volume,

diff --git a/doomsday/plugins/fmod/fmod.pro b/doomsday/plugins/fmod/fmod.pro
@@ -9,6 +9,8 @@ TARGET = dsfmod
 
 VERSION = $$FMOD_VERSION
 
+#DEFINES += DENG_DSFMOD_DEBUG
+
 INCLUDEPATH += include
 
 HEADERS += \

diff --git a/doomsday/plugins/jhexen/defs/audio.ded b/doomsday/plugins/jhexen/defs/audio.ded
@@ -744,7 +744,7 @@ Sound {
   Name = "PotteryExplode";
   Priority = 32;
   Max channels = 2;
-  Flags = "sf_shift";
+  Flags = "sf_shift sf_dontstop";
 }
 
 Sound {