Browse Source

Fix merged function `sound_update`

pull/114/head
galaxyhaxz 7 years ago committed by Anders Jenbo
parent
commit
7fcbc7319c
  1. 2
      3rdParty/Storm/Source/storm.cpp
  2. 2
      3rdParty/Storm/Source/storm.h
  3. 9
      Source/effects.cpp
  4. 1
      Source/effects.h

2
3rdParty/Storm/Source/storm.cpp vendored

@ -67,7 +67,7 @@ BOOL STORMAPI SFileCloseFile(HANDLE hFile) rBool;
BOOL STORMAPI SFileDdaBeginEx(HANDLE hFile, DWORD flags, DWORD mask, unsigned __int32 lDistanceToMove, signed __int32 volume, signed int a6, int a7) rBool;
BOOL STORMAPI SFileDdaDestroy() rBool;
BOOL STORMAPI SFileDdaEnd(HANDLE hFile) rBool;
BOOL STORMAPI SFileDdaGetPos(HANDLE hFile, int *current, int *end) rBool;
BOOL STORMAPI SFileDdaGetPos(HANDLE hFile, DWORD *current, DWORD *end) rBool;
BOOL STORMAPI SFileDdaInitialize(HANDLE directsound) rBool;
BOOL STORMAPI SFileDdaSetVolume(HANDLE hFile, signed int bigvolume, signed int volume) rBool;

2
3rdParty/Storm/Source/storm.h vendored

@ -497,7 +497,7 @@ BOOL STORMAPI SFileCloseFile(HANDLE hFile);
BOOL STORMAPI SFileDdaBeginEx(HANDLE hFile, DWORD flags, DWORD mask, unsigned __int32 lDistanceToMove, signed __int32 volume, signed int pan, int a7);
BOOL STORMAPI SFileDdaDestroy();
BOOL STORMAPI SFileDdaEnd(HANDLE hFile);
BOOL STORMAPI SFileDdaGetPos(HANDLE hFile, int *current, int *end);
BOOL STORMAPI SFileDdaGetPos(HANDLE hFile, DWORD *current, DWORD *end);
BOOL STORMAPI SFileDdaInitialize(HANDLE directsound);
BOOL STORMAPI SFileDdaSetVolume(HANDLE hFile, signed int bigvolume, signed int volume);

9
Source/effects.cpp

@ -1144,13 +1144,18 @@ void sound_stop()
void sound_update()
{
int current, end;
if (!gbSndInited) {
return;
}
snd_update(FALSE);
effects_update();
}
void effects_update()
{
DWORD current, end;
if (sfx_stream != NULL && SFileDdaGetPos(sfx_stream, &current, &end) && current >= end) {
sfx_stop();
}

1
Source/effects.h

@ -21,6 +21,7 @@ void PlaySfxLoc(int psfx, int x, int y);
void FreeMonsterSnd();
void sound_stop();
void sound_update();
void effects_update();
void effects_cleanup_sfx();
void stream_update();
void priv_sound_init(UCHAR bLoadMask);

Loading…
Cancel
Save