renaming module

This commit is contained in:
nek0 2018-06-25 23:59:12 +02:00
parent daaadca17b
commit 39749a8afe
6 changed files with 11 additions and 11 deletions

View file

@ -20,7 +20,7 @@ import NanoVG hiding (V2(..))
-- internal imports -- internal imports
import Types import Types
import Test import MainGame
import Util import Util
loadLoad :: Affection UserData () loadLoad :: Affection UserData ()
@ -157,7 +157,7 @@ updateLoad _ = do
putAffection ud putAffection ud
{ assetImages = loadAssetImages ld { assetImages = loadAssetImages ld
, assetAnimations = loadAssetAnims ld , assetAnimations = loadAssetAnims ld
, state = Menu , state = Main
, stateData = None , stateData = None
} }
loadMap loadMap

View file

@ -1,4 +1,4 @@
module Test where module MainGame where
import Affection as A import Affection as A
@ -101,7 +101,7 @@ loadMapFork ud future progress = do
} }
) npcposs ) npcposs
void $ liftIO $ swapMVar progress (16 / loadSteps) void $ liftIO $ swapMVar progress (16 / loadSteps)
putMVar future (nws, MenuData putMVar future (nws, MainData
{ mapMat = mat { mapMat = mat
, imgMat = M.fromList (nrows inter) (ncols inter) $ , imgMat = M.fromList (nrows inter) (ncols inter) $
Prelude.map Prelude.map

View file

@ -7,18 +7,18 @@ import Affection
import Types import Types
import Load import Load
import Test import MainGame
instance StateMachine State UserData where instance StateMachine State UserData where
smLoad Menu = loadMap smLoad Main = loadMap
smLoad Load = loadLoad smLoad Load = loadLoad
smUpdate Menu = updateMap smUpdate Main = updateMap
smUpdate Load = updateLoad smUpdate Load = updateLoad
smDraw Menu = drawMap smDraw Main = drawMap
smDraw Load = drawLoad smDraw Load = drawLoad

View file

@ -18,7 +18,7 @@ data StateData
{ loadAssetImages :: Map ImgId Image { loadAssetImages :: Map ImgId Image
, loadAssetAnims :: Map AnimId Animation , loadAssetAnims :: Map AnimId Animation
} }
| MenuData | MainData
{ mapMat :: Matrix TileState { mapMat :: Matrix TileState
, imgMat :: Matrix (Maybe ImgId) , imgMat :: Matrix (Maybe ImgId)
, reachPoints :: [ReachPoint] , reachPoints :: [ReachPoint]

View file

@ -44,7 +44,7 @@ data UserData = UserData
data State data State
= Load = Load
| Menu | Main
| Test | Test
data Entity f = Entity data Entity f = Entity

View file

@ -33,7 +33,7 @@ executable tracer-game
, Interior , Interior
, Init , Init
, Load , Load
, Test , MainGame
, Navigation , Navigation
, MindMap , MindMap
, NPC , NPC