back to old ecstasy

This commit is contained in:
nek0 2019-03-07 09:51:34 +01:00
parent 46068b99ab
commit b2e9af5efd
2 changed files with 2 additions and 4 deletions

View file

@ -1,4 +1,3 @@
packages: packages:
./ ./
../ecstasy/
profiling: True profiling: True

View file

@ -4,7 +4,6 @@ module Main where
import Affection as A import Affection as A
import Data.Ecstasy import Data.Ecstasy
import Data.Ecstasy.Types
import qualified SDL import qualified SDL
@ -63,7 +62,7 @@ pre = do
_ <- partSubscribe k toggleFullScreen _ <- partSubscribe k toggleFullScreen
_ <- partSubscribe k quitGame _ <- partSubscribe k quitGame
u <- partSubscribe j cacheJoypad u <- partSubscribe j cacheJoypad
(ws, _) <- yieldSystemT (SystemState 0 defStorage defHooks) (return ()) (ws, _) <- yieldSystemT (0, defStorage) (return ())
putAffection ud putAffection ud
{ threadContext = Just threadCtx { threadContext = Just threadCtx
, window = Just (drawWindow ad) , window = Just (drawWindow ad)
@ -85,7 +84,7 @@ quitGame (MsgKeyboardEvent _ _ SDL.Pressed False sym)
mapM_ (partUnSubscribe j) (uuid ud) mapM_ (partUnSubscribe j) (uuid ud)
mapM_ (partUnSubscribe t) (uuid ud) mapM_ (partUnSubscribe t) (uuid ud)
SDL.glMakeCurrent (drawWindow ad) (glContext ad) SDL.glMakeCurrent (drawWindow ad) (glContext ad)
(ws, _) <- yieldSystemT (SystemState 0 defStorage defHooks) (return ()) (ws, _) <- yieldSystemT (0, defStorage) (return ())
putAffection ud putAffection ud
{ worldState = ws { worldState = ws
, state = Load , state = Load