Merge pull request #42 from samarsha/samarsha/no-return

Replace return with if-else chain
bamarsha · Jun 9, 2020 · c16d678 · c16d678
2 parents ef146c7 + b519f53
commit c16d678
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/superposition/system/LevelSystem.scala b/src/superposition/system/LevelSystem.scala
@@ -27,19 +27,16 @@ final class LevelSystem(levels: LevelPlaylist) extends EntitySystem {
   override def update(deltaTime: Float): Unit = {
     if (input.isKeyJustPressed(P)) {
       levels.prev()
-      return
-    }
-    if (input.isKeyJustPressed(R)) {
+    } else if (input.isKeyJustPressed(R)) {
       levels.play()
-      return
-    }
-    val multiverse = levels.current.get.multiverse
-    val allExitSquares = exits.flatMap(ClassicalPosition.mapper.get(_).cells).toSet
-    val playersAtExits = players.map(QuantumPosition.mapper.get(_).cell)
-      .forall(entityCell => multiverse.universes.map(_.state(entityCell)).forall(allExitSquares.contains))
-    if (input.isKeyJustPressed(N) || playersAtExits) {
-      levels.next()
-      return
+    } else {
+      val multiverse = levels.current.get.multiverse
+      val allExitSquares = exits.flatMap(ClassicalPosition.mapper.get(_).cells).toSet
+      val playersAtExits = players.map(QuantumPosition.mapper.get(_).cell)
+        .forall(entityCell => multiverse.universes.map(_.state(entityCell)).forall(allExitSquares.contains))
+      if (input.isKeyJustPressed(N) || playersAtExits) {
+        levels.next()
+      }
     }
   }
 }