Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select

1 files changed, 5 insertions, 1 deletions

diff --git a/include/game.h b/include/game.h
index 1eb7a17..d72e349 100755
--- a/include/game.h
+++ b/include/game.h
@@ -3816,6 +3816,7 @@ extern "C" void Pause__Q44nw4r3snd6detail10BasicSoundFbi(void *_this, bool pause
 extern "C" void Stop__Q44nw4r3snd6detail10BasicSoundFi(void *_this, int unk);

 extern "C" void StrmSound_SetTrackVolume(void *_this, u32 mask, int count, float value);

 extern "C" void SetPitch__Q44nw4r3snd6detail10BasicSoundFf(void *_this, float value);

+extern "C" void SetVolume__Q44nw4r3snd6detail10BasicSoundFfi(void *_this, float value, int count);

 

 namespace nw4r {

 	namespace snd {

@@ -3832,6 +3833,8 @@ namespace nw4r {
 				void SetPitch(float value) { SetPitch__Q44nw4r3snd6detail10BasicSoundFf(data, value); }

 				void Pause(bool pause, int count) { Pause__Q44nw4r3snd6detail10BasicSoundFbi(data, pause, count); }

 

+				void SetVolume(float value, int count) { SetVolume__Q44nw4r3snd6detail10BasicSoundFfi(data, pause, count); }

+

 				void *GetSound() const { return data; }

 

 				void DetachSound();

@@ -3971,7 +3974,8 @@ inline int Player_VF3D4(void *self) {
 	VF_END;

 }

 

-extern "C" void PlaySoundWithFunctionB4(void *spc, nw4r::snd::SoundHandle *handle, int id, int unk);

+extern "C" void PlaySoundWithFunctionB4(void *src, nw4r::snd::SoundHandle *handle, int id, int unk);

+extern "C" void CheckIfPlayingSound(void *src, int id);

 extern void *SoundRelatedClass;

 

 void GetPosForLayoutEffect(VEC3 *pos, bool quack);