diff --git a/cabal.project b/cabal.project index e2a0ca7..a74cef7 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,3 @@ packages: ./ - ../ecstasy/ profiling: True diff --git a/src/Main.hs b/src/Main.hs index cd33bea..5fb265b 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -4,7 +4,6 @@ module Main where import Affection as A import Data.Ecstasy -import Data.Ecstasy.Types import qualified SDL @@ -63,7 +62,7 @@ pre = do _ <- partSubscribe k toggleFullScreen _ <- partSubscribe k quitGame u <- partSubscribe j cacheJoypad - (ws, _) <- yieldSystemT (SystemState 0 defStorage defHooks) (return ()) + (ws, _) <- yieldSystemT (0, defStorage) (return ()) putAffection ud { threadContext = Just threadCtx , window = Just (drawWindow ad) @@ -85,7 +84,7 @@ quitGame (MsgKeyboardEvent _ _ SDL.Pressed False sym) mapM_ (partUnSubscribe j) (uuid ud) mapM_ (partUnSubscribe t) (uuid ud) SDL.glMakeCurrent (drawWindow ad) (glContext ad) - (ws, _) <- yieldSystemT (SystemState 0 defStorage defHooks) (return ()) + (ws, _) <- yieldSystemT (0, defStorage) (return ()) putAffection ud { worldState = ws , state = Load