src/i_sound.h

@@ -75,10 +75,11 @@ void I_ShutdownSound(void);
 	\param	sep	left-right balancle
 	\param	pitch	not used
 	\param	priority	not used
+	\parm   loops number of loops to play
 
 	\return	sfx handle
 */
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel);
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel, INT16 loops);
 
 /**	\brief	Stops a sound channel.
 

src/lua_baselib.c

@@ -2822,6 +2822,7 @@ static int lib_sStartSound(lua_State *L)
 	void *origin = NULL;
 	sfxenum_t sound_id = luaL_checkinteger(L, 2);
 	player_t *player = NULL;
+	INT16 loops;
 	//NOHUD
 
 	if (sound_id >= NUMSFX)
@@ -2833,6 +2834,9 @@ static int lib_sStartSound(lua_State *L)
 		if (!player)
 			return LUA_ErrInvalid(L, "player_t");
 	}
+
+	loops = (INT16)luaL_optinteger(L, 4, 0);
+
 	if (!lua_isnil(L, 1))
 		if (!GetValidSoundOrigin(L, &origin))
 			return 0;
@@ -2841,7 +2845,7 @@ static int lib_sStartSound(lua_State *L)
 		if (hud_running || hook_cmd_running)
 			origin = NULL;	// HUD rendering and CMD building startsound shouldn't have an origin, just remove it instead of having a retarded error.
 
-		S_StartSound(origin, sound_id);
+		S_StartSoundEx(origin, sound_id, loops);
 	}
 	return 0;
 }
@@ -2852,6 +2856,7 @@ static int lib_sStartSoundAtVolume(lua_State *L)
 	sfxenum_t sound_id = luaL_checkinteger(L, 2);
 	INT32 volume = (INT32)luaL_checkinteger(L, 3);
 	player_t *player = NULL;
+	INT16 loops;
 	//NOHUD
 
 	if (sound_id >= NUMSFX)
@@ -2866,8 +2871,10 @@ static int lib_sStartSoundAtVolume(lua_State *L)
 		if (!GetValidSoundOrigin(L, &origin))
 			return LUA_ErrInvalid(L, "mobj_t/sector_t");
 
+	loops = (INT16)luaL_optinteger(L, 5, 0);
+
 	if (!player || P_IsLocalPlayer(player))
-		S_StartSoundAtVolume(origin, sound_id, volume);
+		S_StartSoundAtVolumeEx(origin, sound_id, volume, loops);
 	return 0;
 }
 

src/s_sound.c

@@ -516,7 +516,7 @@ void S_StartCaption(sfxenum_t sfx_id, INT32 cnum, UINT16 lifespan)
 	closedcaptions[set].b = 2; // bob
 }
 
-void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
+void S_StartSoundAtVolumeEx(const void *origin_p, sfxenum_t sfx_id, INT32 volume, INT16 loops)
 {
 	const INT32 initial_volume = volume;
 	INT32 sep, pitch, priority, cnum;
@@ -663,7 +663,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 
 		// Assigns the handle to one of the channels in the
 		// mix/output buffer.
-		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
+		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum, loops);
 	}
 
 dontplay:
@@ -717,10 +717,10 @@ dontplay:
 	// Assigns the handle to one of the channels in the
 	// mix/output buffer.
 	channels[cnum].volume = initial_volume;
-	channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
+	channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum, loops);
 }
 
-void S_StartSound(const void *origin, sfxenum_t sfx_id)
+void S_StartSoundEx(const void *origin, sfxenum_t sfx_id, INT16 loops)
 {
 	if (S_SoundDisabled())
 		return;
@@ -792,7 +792,7 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
 		HW3S_StartSound(origin, sfx_id);
 	else
 #endif
-		S_StartSoundAtVolume(origin, sfx_id, 255);
+		S_StartSoundAtVolumeEx(origin, sfx_id, 255, loops);
 }
 
 void S_StopSound(void *origin)

src/s_sound.h

@@ -140,12 +140,15 @@ lumpnum_t S_GetSfxLumpNum(sfxinfo_t *sfx);
 boolean S_SoundDisabled(void);
 
 //
-// Start sound for thing at <origin> using <sound_id> from sounds.h
+// Start sound for thing at <origin> using <sound_id> from sounds.h, looped <loops> times
 //
-void S_StartSound(const void *origin, sfxenum_t sound_id);
+void S_StartSoundEx(const void *origin, sfxenum_t sound_id, INT16 loops);
 
 // Will start a sound at a given volume.
-void S_StartSoundAtVolume(const void *origin, sfxenum_t sound_id, INT32 volume);
+void S_StartSoundAtVolumeEx(const void *origin, sfxenum_t sound_id, INT32 volume, INT16 loops);
+
+#define S_StartSoundAtVolume(a, b, c) S_StartSoundAtVolumeEx(a, b, c, 0)
+#define S_StartSound(a, b) S_StartSoundEx(a, b, 0)
 
 // Stop sound for thing at <origin>
 void S_StopSound(void *origin);
@@ -319,7 +322,7 @@ INT32 S_OriginPlaying(void *origin);
 INT32 S_IdPlaying(sfxenum_t id);
 INT32 S_SoundPlaying(void *origin, sfxenum_t id);
 
-void S_StartSoundName(void *mo, const  char *soundname);
+void S_StartSoundName(void *mo, const char *soundname);
 
 void S_StopSoundByID(void *origin, sfxenum_t sfx_id);
 void S_StopSoundByNum(sfxenum_t sfxnum);

src/sdl/mixer_sound.c

@@ -589,10 +589,10 @@ void I_FreeSfx(sfxinfo_t *sfx)
 	sfx->lumpnum = LUMPERROR;
 }
 
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel, INT16 loops)
 {
 	UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
-	INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
+	INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, loops);
 	Mix_Volume(handle, volume);
 	Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
 	(void)pitch; // Mixer can't handle pitch