Game: Fix missing sound from the bubble effect in liquids

[d2df-sdl.git] / src / game / g_triggers.pas

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 55057b622a11f6b54475ee9d4265d580a7312097..e9fa513f7c6243b3bfac35dfee694d45266a30ad 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -725,37 +725,37 @@ begin
 
     TRIGGER_SHOT_IMP:
       begin
-        g_Weapon_ball1(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_ball1(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREBALL';
       end;
 
     TRIGGER_SHOT_PLASMA:
       begin
-        g_Weapon_Plasma(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_Plasma(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREPLASMA';
       end;
 
     TRIGGER_SHOT_SPIDER:
       begin
-        g_Weapon_aplasma(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_aplasma(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREPLASMA';
       end;
 
     TRIGGER_SHOT_CACO:
       begin
-        g_Weapon_ball2(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_ball2(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREBALL';
       end;
 
     TRIGGER_SHOT_BARON:
       begin
-        g_Weapon_ball7(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_ball7(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREBALL';
       end;
 
     TRIGGER_SHOT_MANCUB:
       begin
-        g_Weapon_manfire(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_manfire(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREBALL';
       end;
 
@@ -767,13 +767,13 @@ begin
 
     TRIGGER_SHOT_ROCKET:
       begin
-        g_Weapon_Rocket(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_Rocket(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREROCKET';
       end;
 
     TRIGGER_SHOT_BFG:
       begin
-        g_Weapon_BFGShot(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_BFGShot(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_WEAPON_FIREBFG';
       end;
 
@@ -807,7 +807,7 @@ begin
 
     TRIGGER_SHOT_FLAME:
       begin
-        g_Weapon_flame(wx, wy, dx, dy, 0, -1, True);
+        g_Weapon_flame(wx, wy, dx, dy, 0, -1, True, False);
         snd := 'SOUND_GAME_BURNING';
       end;
 
@@ -884,7 +884,13 @@ begin
       TRIGGER_EFFECT_DLIQUID: g_GFX_SimpleWater(X, Y, 1, VX, VY, 5, CR, CG, CB);
       TRIGGER_EFFECT_BLOOD: g_GFX_Blood(X, Y, 1, VX, VY, 0, 0, CR, CG, CB);
       TRIGGER_EFFECT_SPARK: g_GFX_Spark(X, Y, 1, GetAngle2(VX, VY), 0, 0);
-      TRIGGER_EFFECT_BUBBLE: g_GFX_Bubbles(X, Y, 1, 0, 0);
+      TRIGGER_EFFECT_BUBBLE:
+      begin
+        g_GFX_Bubbles(X, Y, 1, 0, 0);
+        if not Silent then if Random(2) = 0
+          then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', X, Y)
+          else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', X, Y);
+      end;
     end;
   end;
 
@@ -1349,17 +1355,13 @@ begin
         begin
           Enabled := False;
           Result := True;
-          if gLMSRespawn = LMS_RESPAWN_NONE then
+          p := g_Player_Get(ActivateUID);
+          p.GetSecret();
+          Inc(gCoopSecretsFound);
+          if g_Game_IsNet then
           begin
-            p := g_Player_Get(ActivateUID);
-            p.GetSecret();
-            Inc(gCoopSecretsFound);
-            if g_Game_IsNet then
-            begin
-              MH_SEND_GameStats();
-              if p.FClientID >= 0 then
-                MH_SEND_GameEvent(NET_EV_SECRET, p.UID, '');
-            end;
+            MH_SEND_GameStats();
+            MH_SEND_GameEvent(NET_EV_SECRET, p.UID, '');
           end;
         end;
 
@@ -2599,8 +2601,9 @@ var
 begin
   if (tgMonsList = nil) then tgMonsList := TSimpleMonsterList.Create();
 
-  if gTriggers = nil then
-    Exit;
+  if gTriggers = nil then Exit;
+  if gLMSRespawn > LMS_RESPAWN_NONE then Exit; // don't update triggers at all
+
   SetLength(Affected, 0);
 
   for a := 0 to High(gTriggers) do