done adding LevelType.level_type as a field of GameType.game_type, and having main loop go through GameUpdate.game_type -> LevelUpdate.update

fcore/game-type.sml

@@ -1,16 +1,20 @@
 signature GAME_TYPE =
 sig
-  datatype mode =
-    LEVEL of LevelType.level_type
+  datatype mode = LEVEL of LevelType.level_type
+
+  type game_type = {userKeys: CoreKey.user_key, mode: mode}
+
+  val init: CoreKey.user_key -> game_type
 end
 
 structure GameType :> GAME_TYPE =
 struct
-  datatype mode =
-    LEVEL of LevelType.level_type
+  datatype mode = LEVEL of LevelType.level_type
 
-  type game_type = {
-    userKeys: CoreKey.user_key,
-    mode: mode
-  }
+  type game_type = {userKeys: CoreKey.user_key, mode: mode}
+
+  fun init userKeys =
+    let val mode = LEVEL LevelType.initial
+    in {mode = mode, userKeys = userKeys}
+    end
 end

fcore/game-update.sml

@@ -0,0 +1,18 @@
+structure GameUpdate =
+struct
+  open GameType
+
+  fun update (game: GameType.game_type, input) =
+    let
+      val {mode, userKeys} = game
+
+      val mode =
+        case mode of
+          LEVEL level =>
+            let val level = LevelUpdate.update (level, input)
+            in LEVEL level
+            end
+    in
+      {mode = mode, userKeys = userKeys}
+    end
+end

fcore/level/level-type.sml

@@ -9,10 +9,9 @@ sig
     , enemies: EnemyMap.t
     , graph: PlatSet.elem vector vector
     , fallingEnemies: FallingEnemyMap.t
-    , userKeys: CoreKey.user_key
     }
 
-  val initial: CoreKey.user_key -> level_type
+  val initial: level_type
 end
 
 structure LevelType :> LEVEL_TYPE =
@@ -26,7 +25,6 @@ struct
     , enemies: EnemyMap.t
     , graph: PlatSet.elem vector vector
     , fallingEnemies: FallingEnemyMap.t
-    , userKeys: CoreKey.user_key
     }
 
   fun enemyMapFromList (hd :: tl, map) =
@@ -35,7 +33,7 @@ struct
         end
     | enemyMapFromList ([], map) = map
 
-  fun initial userKeys =
+  val initial =
     let
       val player =
         { yAxis = EntityType.JUMPING 0
@@ -142,7 +140,6 @@ struct
       , enemies = enemies
       , graph = graph
       , fallingEnemies = FallingEnemyMap.empty
-      , userKeys = userKeys
       }
     end
 end

fcore/level/level-update.sml

@@ -11,7 +11,6 @@ struct
         , enemies
         , graph
         , fallingEnemies
-        , userKeys
         } = game
 
       val player = Player.runPhysicsAndInput (game, input)
@@ -40,7 +39,6 @@ struct
       , enemies = enemies
       , graph = graph
       , fallingEnemies = fallingEnemies
-      , userKeys = userKeys
       }
     end
 end

fcore/level/player/player.sml

@@ -501,10 +501,7 @@ struct
         case attacked of
           NOT_ATTACKED => (1.0, 1.0, 1.0)
         | ATTACKED amt =>
-            if amt mod 5 = 0 then 
-              (1.0, 1.0, 1.0)
-            else 
-              (1.0, 0.75, 0.75)
+            if amt mod 5 = 0 then (1.0, 1.0, 1.0) else (1.0, 0.75, 0.75)
     in
       PlayerSprite.lerp (x, y, realWidth, realHeight, width, height, r, g, b)
     end