Merge pull request scp-fs2open#6714 from Goober5000/goto_considered_useful

Goober5000 · web-flow · commit 11b085ca6629 · 2025-05-09T20:36:12.000-04:00
goto considered useful
diff --git a/code/sound/ds.cpp b/code/sound/ds.cpp
@@ -772,7 +772,7 @@ int ds_get_free_channel_retail(float new_volume, int snd_id, int priority)
 			continue;
 		}
 
-		OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), continue );
+		OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), goto continue_channels );
 
 		if ( (status == AL_INITIAL) || (status == AL_STOPPED) ) {
 			ds_close_channel_fast(i);
@@ -795,6 +795,7 @@ int ds_get_free_channel_retail(float new_volume, int snd_id, int priority)
 				lowest_vol = chp->vol;
 			}
 		}
+continue_channels: ;
 	}
 
 	// If we've exceeded the limit, then maybe stop the duplicate if it is lower volume
@@ -885,7 +886,7 @@ int ds_get_free_channel_enhanced(float new_volume, int snd_id, int enhanced_prio
 			continue;
 		}
 
-		OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), continue );
+		OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), goto continue_channels );
 
 		if ( (status == AL_INITIAL) || (status == AL_STOPPED) ) {
 			ds_close_channel_fast(i);
@@ -924,6 +925,7 @@ int ds_get_free_channel_enhanced(float new_volume, int snd_id, int enhanced_prio
 				least_important_priority = chp->priority;
 			}
 		}
+continue_channels: ;
 	}
 
 	// If we've exceeded the limit, then stop the least important duplicate if it is lower or equal volume

Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ int ds_get_free_channel_retail(float new_volume, int snd_id, int priority)`
`772`	`772`	`continue;`
`773`	`773`	`}`
`774`	`774`
`775`		`- OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), continue );`
	`775`	`+ OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), goto continue_channels );`
`776`	`776`
`777`	`777`	`if ( (status == AL_INITIAL) \|\| (status == AL_STOPPED) ) {`
`778`	`778`	`ds_close_channel_fast(i);`
`@@ -795,6 +795,7 @@ int ds_get_free_channel_retail(float new_volume, int snd_id, int priority)`
`795`	`795`	`lowest_vol = chp->vol;`
`796`	`796`	`}`
`797`	`797`	`}`
	`798`	`+continue_channels: ;`
`798`	`799`	`}`
`799`	`800`
`800`	`801`	`// If we've exceeded the limit, then maybe stop the duplicate if it is lower volume`
`@@ -885,7 +886,7 @@ int ds_get_free_channel_enhanced(float new_volume, int snd_id, int enhanced_prio`
`885`	`886`	`continue;`
`886`	`887`	`}`
`887`	`888`
`888`		`- OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), continue );`
	`889`	`+ OpenAL_ErrorCheck( alGetSourcei(chp->source_id, AL_SOURCE_STATE, &status), goto continue_channels );`
`889`	`890`
`890`	`891`	`if ( (status == AL_INITIAL) \|\| (status == AL_STOPPED) ) {`
`891`	`892`	`ds_close_channel_fast(i);`
`@@ -924,6 +925,7 @@ int ds_get_free_channel_enhanced(float new_volume, int snd_id, int enhanced_prio`
`924`	`925`	`least_important_priority = chp->priority;`
`925`	`926`	`}`
`926`	`927`	`}`
	`928`	`+continue_channels: ;`
`927`	`929`	`}`
`928`	`930`
`929`	`931`	`// If we've exceeded the limit, then stop the least important duplicate if it is lower or equal volume`