Unify config files, add capability to remember window position
This commit is contained in:
+6
-6
@@ -1,6 +1,5 @@
|
||||
module Main where
|
||||
import Loop
|
||||
import LoadConfig
|
||||
import Dodge.Data
|
||||
import Dodge.Initialisation
|
||||
import Dodge.Update
|
||||
@@ -22,24 +21,25 @@ import Data.Preload
|
||||
import Data.Preload.Render
|
||||
|
||||
import Control.Lens
|
||||
--import Foreign (Word32)
|
||||
import Control.Monad
|
||||
--import System.Random
|
||||
--import qualified Data.Map as M
|
||||
import qualified Data.IntMap as IM
|
||||
import Graphics.Rendering.OpenGL hiding (color, rotate, scale, translate)
|
||||
import qualified SDL
|
||||
import qualified SDL.Mixer as Mix
|
||||
--import qualified Control.Monad.Parallel as MP
|
||||
import Control.Parallel
|
||||
import qualified Data.Map.Strict as M
|
||||
|
||||
main :: IO ()
|
||||
main = do
|
||||
(sizex,sizey) <- loadConfig
|
||||
con <- loadDodgeConfig
|
||||
let sizex = floor $ _windowX con
|
||||
sizey = floor $ _windowY con
|
||||
posx = _windowPosX con
|
||||
posy = _windowPosY con
|
||||
setupLoop
|
||||
20
|
||||
(sizex,sizey)
|
||||
(posx,posy)
|
||||
theCleanup
|
||||
(firstWorldLoad (sizex,sizey))
|
||||
theUpdateStep
|
||||
|
||||
Reference in New Issue
Block a user