From d3804911cfefc1d3869977bbe74bc869a3b18da2 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Mon, 18 Jan 2021 04:00:58 -0500 Subject: [PATCH] - Fix the previous commit Revert "Fixed a missing parameter in S_Sound's ZScript prototype that was causing assertion failures." This reverts commit 619f44decda99e2afda635ec0a8a01c5a76d8efc. --- src/sound/s_doomsound.cpp | 3 ++- wadsrc/static/zscript/doombase.zs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sound/s_doomsound.cpp b/src/sound/s_doomsound.cpp index 7d506ca66..c8cbd4bb8 100644 --- a/src/sound/s_doomsound.cpp +++ b/src/sound/s_doomsound.cpp @@ -415,7 +415,8 @@ DEFINE_ACTION_FUNCTION(DObject, S_Sound) PARAM_FLOAT(volume); PARAM_FLOAT(attn); PARAM_FLOAT(pitch); - S_SoundPitch(channel & 7, EChanFlags::FromInt(channel & ~7), id, static_cast(volume), static_cast(attn), static_cast(pitch), 0.0f); + PARAM_FLOAT(startTime); + S_SoundPitch(channel & 7, EChanFlags::FromInt(channel & ~7), id, static_cast(volume), static_cast(attn), static_cast(pitch), static_cast(startTime)); return 0; } diff --git a/wadsrc/static/zscript/doombase.zs b/wadsrc/static/zscript/doombase.zs index 68569dd5f..1aef08e75 100644 --- a/wadsrc/static/zscript/doombase.zs +++ b/wadsrc/static/zscript/doombase.zs @@ -125,7 +125,7 @@ extend class Object { return level.PickPlayerStart(pnum, flags); } - deprecated("4.3", "Use S_StartSound() instead") native static void S_Sound (Sound sound_id, int channel, float volume = 1, float attenuation = ATTN_NORM, float pitch = 0.0); + deprecated("4.3", "Use S_StartSound() instead") native static void S_Sound (Sound sound_id, int channel, float volume = 1, float attenuation = ATTN_NORM, float pitch = 0.0, float startTime); native static void S_StartSound (Sound sound_id, int channel, int flags = 0, float volume = 1, float attenuation = ATTN_NORM, float pitch = 0.0, float startTime = 0.0); native static void S_PauseSound (bool notmusic, bool notsfx); native static void S_ResumeSound (bool notsfx);