Merge pull request scp-fs2open#6352 from Goober5000/allow_explicitly_…

…empty_sounds allow explicitly empty sounds
Goober5000 · Sep 18, 2024 · 56fc5b4 · 56fc5b4
2 parents 461c628 + b596fa3
commit 56fc5b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/code/gamesnd/gamesnd.cpp b/code/gamesnd/gamesnd.cpp
@@ -654,7 +654,7 @@ void parse_gamesnd_old(game_snd* gs)
 	{
 		entry.filename[0] = 0;
 		advance_to_eoln(nullptr);
-		gs->flags |= GAME_SND_NOT_VALID;
+		gs->flags |= (GAME_SND_NOT_VALID | GAME_SND_EXPLICITLY_EMPTY);
 		return;
 	}
 	Mp++;
@@ -883,7 +883,7 @@ void parse_gamesnd_new(game_snd* gs, bool no_create)
 	if (!stricmp(name, NOX("empty")) || !stricmp(name, NOX("none")))
 	{
 		entry->filename[0] = 0;
-		gs->flags |= GAME_SND_NOT_VALID;
+		gs->flags |= (GAME_SND_NOT_VALID | GAME_SND_EXPLICITLY_EMPTY);
 		return;
 	}
 
@@ -965,7 +965,7 @@ void parse_gamesnd_new(game_snd* gs, bool no_create)
 
 bool gamesnd_is_placeholder(const game_snd& gs)
 {
-	return gs.sound_entries.empty() || gs.sound_entries[0].filename[0] == '\0';
+	return (gs.sound_entries.empty() || gs.sound_entries[0].filename[0] == '\0') && !(gs.flags & GAME_SND_EXPLICITLY_EMPTY);
 }
 
 void gamesnd_parse_entry(game_snd *gs, bool &orig_no_create, SCP_vector<game_snd> *lookupVector, size_t lookupVectorMaxIndexableSize, bool (*is_reserved_index)(int))

diff --git a/code/sound/sound.h b/code/sound/sound.h
@@ -26,6 +26,7 @@
 #define GAME_SND_NOT_VALID			(1<<2)
 #define GAME_SND_PRELOAD			(1<<3)	//!< preload sound (ie read from disk before mission starts)
 #define GAME_SND_RETAIL_STYLE		(1<<4)
+#define GAME_SND_EXPLICITLY_EMPTY	(1<<5)	// a sound that has been parsed as empty
 
 // Priorities that can be passed to snd_play() functions to limit how many concurrent sounds of a 
 // given type are played.