Use TryGetValue instead of ContainsKey and a lookup for cached sounds

OpenRA · May 22, 2022 · 6601306 · 6601306
1 parent ea04a7f
commit 6601306
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/OpenRA.Game/Sound/Sound.cs b/OpenRA.Game/Sound/Sound.cs
@@ -401,9 +401,8 @@ public float VideoVolume
 
 			if (!string.IsNullOrEmpty(name) && (p == null || p == p.World.LocalPlayer))
 			{
-				if (currentNotifications.ContainsKey(name))
+				if (currentNotifications.TryGetValue(name, out var currentNotification))
 				{
-					var currentNotification = currentNotifications[name];
 					if (!currentNotification.Complete)
 					{
 						if (pool.AllowInterrupt)
@@ -412,9 +411,8 @@ public float VideoVolume
 							return false;
 					}
 				}
-				else if (currentSounds.ContainsKey(actorId))
+				else if (currentSounds.TryGetValue(actorId, out var currentSound))
 				{
-					var currentSound = currentSounds[actorId];
 					if (!currentSound.Complete)
 					{
 						if (pool.AllowInterrupt)