- Fix the previous commit

Revert "Fixed a missing parameter in S_Sound's ZScript prototype that was causing assertion failures." This reverts commit 619f44d.
ZDoom · Jan 18, 2021 · d380491 · d380491 · Cacodemon345 · Jan 18, 2021
1 parent 619f44d
commit d380491
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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<float>(volume), static_cast<float>(attn), static_cast<float>(pitch), 0.0f);
+	PARAM_FLOAT(startTime);
+	S_SoundPitch(channel & 7, EChanFlags::FromInt(channel & ~7), id, static_cast<float>(volume), static_cast<float>(attn), static_cast<float>(pitch), static_cast<float>(startTime));
 	return 0;
 }
 

diff --git 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);