X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FSound.c;h=1284e58c30988017e6e0a98e72ee4867d5bd301b;hb=ce0bba1a070e5e64939491eb68087f68ef8fe870;hp=61c82b00eacc99e8b1eae8a703ee562786a5f9db;hpb=8d3d7d213a9691455a49544624bf380e85f43461;p=rocksndiamonds.git

diff --git a/src/game_sp/Sound.c b/src/game_sp/Sound.c
index 61c82b00..1284e58c 100644
--- a/src/game_sp/Sound.c
+++ b/src/game_sp/Sound.c
@@ -11,6 +11,8 @@
 int MusicOnFlag;
 int FXOnFlag;
 
+#if 0
+
 DirectSoundBuffer ZonkFX[1 + 1];
 DirectSoundBuffer InfotronFX[1 + 1];
 DirectSoundBuffer BugFX[1 + 1];
@@ -19,10 +21,13 @@ DirectSoundBuffer PushFX;
 DirectSoundBuffer ExitFX;
 DirectSoundBuffer BaseFX;
 
-#if 0
+#endif
 
 void LoadSoundFX()
 {
+
+#if 0
+
   DSBUFFERDESC bufferDesc;
   WAVEFORMATEX waveFormat;
   char *FName;
@@ -48,12 +53,15 @@ void LoadSoundFX()
   ExitFX = DSound.CreateSoundBufferFromFile(CAT(FName, "Exit.wav"), bufferDesc, waveFormat);
   PushFX = DSound.CreateSoundBufferFromFile(CAT(FName, "Push.wav"), bufferDesc, waveFormat);
   //  FXOnFlag = 0
-}
 
 #endif
 
+}
+
 void subSoundFXZonk()
 {
+#if 0
+
   int i;
 
   if (FXOnFlag == 0)
@@ -70,10 +78,14 @@ void subSoundFXZonk()
       }
     }
   }
+
+#endif
 }
 
 void subSoundFXBug()
 {
+#if 0
+
   int i;
 
   if (FXOnFlag == 0)
@@ -90,10 +102,14 @@ void subSoundFXBug()
       }
     }
   }
+
+#endif
 }
 
 void subSoundFXInfotron()
 {
+#if 0
+
   int i;
 
   if (FXOnFlag == 0)
@@ -110,10 +126,14 @@ void subSoundFXInfotron()
       }
     }
   }
+
+#endif
 }
 
 void subSoundFXExplosion()
 {
+#if 0
+
   int i;
 
   if (FXOnFlag == 0)
@@ -130,10 +150,14 @@ void subSoundFXExplosion()
       }
     }
   }
+
+#endif
 }
 
 void subSoundFXBase()
 {
+#if 0
+
   if (FXOnFlag == 0)
     return;
 
@@ -144,10 +168,14 @@ void subSoundFXBase()
   {
     BaseFX.Play DSBPLAY_DEFAULT;
   }
+
+#endif
 }
 
 void subSoundFXPush()
 {
+#if 0
+
   if (FXOnFlag == 0)
     return;
 
@@ -158,10 +186,14 @@ void subSoundFXPush()
   {
     PushFX.Play DSBPLAY_DEFAULT;
   }
+
+#endif
 }
 
 void subSoundFXExit()
 {
+#if 0
+
   if (FXOnFlag == 0)
     return;
 
@@ -172,6 +204,16 @@ void subSoundFXExit()
   {
     ExitFX.Play DSBPLAY_DEFAULT;
   }
+
+#endif
+}
+
+void subSoundFX(int si, int element, int action)
+{
+  int x = GetX(si);
+  int y = GetY(si);
+
+  PlayLevelSound_SP(x, y, element, action);
 }
 
 void subMusicInit()