Game: Split bubbles effect code into a distinct function

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

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index f0fe29114071a4c6b9f5ce2f9b64ec678d387e77..86a9de5e15a45b072a8da158d9d981e84cc77dac 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -2278,10 +2278,7 @@ begin
           // Â âîäå øëåéô - ïóçûðè, â âîçäóõå øëåéô - äûì:
             if WordBool(st and MOVE_INWATER) then
             begin
-              g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16);
-              if Random(2) = 0
-                then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', cx, cy)
-                else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', cx, cy);
+              g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16);
             end
             else if g_Frames_Get(_id, 'FRAMES_SMOKE') then
             begin
@@ -2413,12 +2410,8 @@ begin
                 end;
               end
               else
-              begin
-                g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16);
-                if Random(2) = 0
-                  then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', cx, cy)
-                  else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', cx, cy);
-              end;
+                g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16);
+
               ShotType := 0;
               Continue;
             end;