#604 make a few sections use fewer lines

shieldgenerator7 · Aug 12, 2024 · 560ad8f · 560ad8f
1 parent 04dfee9
commit 560ad8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/Assets/Scripts/Menu/MenuButton.cs b/Assets/Scripts/Menu/MenuButton.cs
@@ -38,13 +38,7 @@ public virtual bool acceptsDragGesture()
 
     public virtual void activate()
     {
-        if (frame != null)
-        {
-            frame.frameCamera();
-        }
-        if (mab != null)
-        {
-            mab.activate();
-        }
+        frame?.frameCamera();
+        mab?.activate();
     }
 }
diff --git a/Assets/Scripts/Menu/MenuFrame.cs b/Assets/Scripts/Menu/MenuFrame.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 /// <summary>
@@ -64,14 +65,8 @@ public bool tapInArea(Vector3 tapPos)
 
     public void delegateTap(Vector3 tapPos)
     {
-        foreach (MenuButton mb in buttons)
-        {
-            if (mb.tapInArea(tapPos))
-            {
-                mb.processTap(tapPos);
-                return;
-            }
-        }
+        buttons.FirstOrDefault(mb => mb.tapInArea(tapPos))?
+            .processTap(tapPos);
     }
     public bool delegateDrag(Vector3 origMPWorld, Vector3 newMPWorld)
     {