From 553c6978d62c9ea073070fb0f58b67ec8b84dde2 Mon Sep 17 00:00:00 2001 From: jgk Date: Mon, 22 Mar 2021 21:36:24 +0100 Subject: [PATCH] Add config.json file and Aeson dependency in package.yaml --- config.json | 4 ++++ package.yaml | 3 ++- src/Dodge/Item/Weapon/TriggerType.hs | 2 -- src/Loop.hs | 10 ---------- 4 files changed, 6 insertions(+), 13 deletions(-) create mode 100644 config.json diff --git a/config.json b/config.json new file mode 100644 index 000000000..1ef1b6633 --- /dev/null +++ b/config.json @@ -0,0 +1,4 @@ +{ + "windowxsize": 800, + "windowysize": 600 +} diff --git a/package.yaml b/package.yaml index 7f58e0f11..079f494fd 100644 --- a/package.yaml +++ b/package.yaml @@ -28,7 +28,7 @@ dependencies: - sdl2-mixer - text - OpenGL -- OpenGLRaw + #- OpenGLRaw - raw-strings-qq - bytestring - lens @@ -44,6 +44,7 @@ dependencies: - transformers - foldl - linear +- aeson library: source-dirs: src diff --git a/src/Dodge/Item/Weapon/TriggerType.hs b/src/Dodge/Item/Weapon/TriggerType.hs index 523ec9f1d..5f3dea84b 100644 --- a/src/Dodge/Item/Weapon/TriggerType.hs +++ b/src/Dodge/Item/Weapon/TriggerType.hs @@ -112,8 +112,6 @@ withRandomDir acc f cid w = over (creatures . ix cid . crDir) (\d -> d - a) withVelWthHiteff :: Point2 -> Float -> HitEffect -> Int -> World -> World withVelWthHiteff vel width hiteff cid w = over particles' ((:) newbul) --- . over tempLightSources ((:) (tLightAt 4 pos)) --- . lowLightAt pos2 $ set randGen g w where cr = _creatures w IM.! cid diff --git a/src/Loop.hs b/src/Loop.hs index 5e747b77b..2032d935c 100644 --- a/src/Loop.hs +++ b/src/Loop.hs @@ -25,16 +25,6 @@ winConfig x y = defaultWindow , windowResizable =True } ---setupLoop :: String --- -> CInt --- -> CInt --- -> IO setupParams --- -> (setupParams -> IO ()) --- -> world --- -> (setupParams -> world -> IO setupParams) --- -> (world -> Event -> Maybe world) --- -> (world -> Maybe world) --- -> IO () setupLoop :: String -> CInt -> CInt