- rewrote test for occupied sound channel without special types

https://forum.zdoom.org/viewtopic.php?t=66613
ZDoom · Dec 10, 2019 · 3cb571c · 3cb571c
1 parent f050a23
commit 3cb571c
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/src/sound/s_sound.cpp b/src/sound/s_sound.cpp
@@ -527,22 +527,9 @@ FSoundChan *SoundEngine::StartSound(int type, const void *source,
 		{
 			if (chan->SourceType == type && chan->EntChannel == channel)
 			{
-				bool foundit;
-
-				switch (type)
-				{
-				case SOURCE_Actor:
-				case SOURCE_Sector:
-				case SOURCE_Polyobj:
-					foundit = chan->Source == source;
-					break;
-				case SOURCE_Unattached:
-					foundit = chan->Point[0] == pt->X && chan->Point[2] == pt->Z && chan->Point[1] == pt->Y;
-					break;
-				default:
-					foundit = false;
-					break;
-				}
+				const bool foundit = (type == SOURCE_Unattached)
+					? (chan->Point[0] == pt->X && chan->Point[2] == pt->Z && chan->Point[1] == pt->Y)
+					: (chan->Source == source);
 
 				if (foundit)
 				{