Merge pull request #6324 from Goober5000/fotg_sound_fix

fix deletion of looping sounds
scp-fs2open · Aug 27, 2024 · b98b8f2 · b98b8f2
2 parents d68b18d + 28659bb
commit b98b8f2
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/code/ship/ship.cpp b/code/ship/ship.cpp
@@ -10360,11 +10360,10 @@ void update_firing_sounds(object* objp, ship* shipp)
 				end_snd_played = wip->end_firing_snd;
 			}
 
-			if (wip->loop_firing_snd.isValid()) {
+			if (swp->firing_loop_sounds[i] >= 0) {
 				obj_snd_delete(objp, swp->firing_loop_sounds[i]);
-				swp->firing_loop_sounds[i] = -1;
-			} else
-				swp->firing_loop_sounds[i] = -1;
+			}
+			swp->firing_loop_sounds[i] = -1;
 		}
 	}
 }