Revisited the game over sequence

1 files changed, 4 insertions, 26 deletions

diff --git a/src/Game.hs b/src/Game.hs
index 0b72f3c..a1f0e2a 100644
--- a/src/Game.hs
+++ b/src/Game.hs
@@ -8,7 +8,6 @@ import Foreign.C.Types (CInt)
 import qualified Game.BitmapFont as BF
 import qualified Game.Controller as C
 import qualified Game.Entities as E
-import Game.Entities.Const (gameOverDelay)
 import qualified Game.Hud as H
 import qualified Game.Map as M
 import qualified Game.Sprites as S
@@ -17,7 +16,7 @@ import qualified Game.Utils as U
 import SDL (($=), ($~))
 import qualified SDL
 import qualified SDL.Image
-import SDL.Vect (V2 (..), V4 (..))
+import SDL.Vect (V2 (..))
 
 name :: String
 name = "Haskell gamedev [Space Platformer]"
@@ -162,12 +161,9 @@ gameLoop = do
 
     void $ liftIO $ do
       state <- readIORef stateRef
-      if state.lives > 0
-        then playLoop env
-        else
-          if state.gameOverDelay > 0
-            then fadeOutLoop env state.gameOverDelay >> stateRef $= state {GS.gameOverDelay = state.gameOverDelay - 1}
-            else gameOverLoop env
+      when (state.gameOverDelay > 1) $ stateRef $= state {GS.gameOverDelay = state.gameOverDelay - 1}
+      when (state.gameOverDelay /= 1) $ playLoop env
+      when (state.gameOverDelay == 1) $ gameOverLoop env
 
     SDL.rendererRenderTarget renderer $= Nothing
     SDL.clear renderer
@@ -194,24 +190,6 @@ gameLoop = do
         H.render renderer hud
         E.render renderer updated
 
-    fadeOutLoop :: Env -> Int -> IO ()
-    fadeOutLoop env i = do
-      let renderer = env.renderer
-          map' = env.map
-          entities = env.entities
-          hud = env.hud
-
-      -- render map and entities
-      -- doing a fade to black
-      void $ do
-        M.render renderer map'
-        H.render renderer hud
-        E.render renderer =<< readIORef entities
-
-        SDL.rendererDrawBlendMode renderer $= SDL.BlendAlphaBlend
-        SDL.rendererDrawColor renderer $= V4 0 0 0 (fromIntegral (255 - i * (255 `div` gameOverDelay)))
-        SDL.fillRect renderer (Just $ U.rect 0 0 320 176)
-
     gameOverLoop :: Env -> IO ()
     gameOverLoop env = do
       let renderer = env.renderer