renaming module
This commit is contained in:
parent
daaadca17b
commit
39749a8afe
6 changed files with 11 additions and 11 deletions
|
@ -20,7 +20,7 @@ import NanoVG hiding (V2(..))
|
|||
-- internal imports
|
||||
|
||||
import Types
|
||||
import Test
|
||||
import MainGame
|
||||
import Util
|
||||
|
||||
loadLoad :: Affection UserData ()
|
||||
|
@ -157,7 +157,7 @@ updateLoad _ = do
|
|||
putAffection ud
|
||||
{ assetImages = loadAssetImages ld
|
||||
, assetAnimations = loadAssetAnims ld
|
||||
, state = Menu
|
||||
, state = Main
|
||||
, stateData = None
|
||||
}
|
||||
loadMap
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
module Test where
|
||||
module MainGame where
|
||||
|
||||
import Affection as A
|
||||
|
||||
|
@ -101,7 +101,7 @@ loadMapFork ud future progress = do
|
|||
}
|
||||
) npcposs
|
||||
void $ liftIO $ swapMVar progress (16 / loadSteps)
|
||||
putMVar future (nws, MenuData
|
||||
putMVar future (nws, MainData
|
||||
{ mapMat = mat
|
||||
, imgMat = M.fromList (nrows inter) (ncols inter) $
|
||||
Prelude.map
|
|
@ -7,18 +7,18 @@ import Affection
|
|||
import Types
|
||||
|
||||
import Load
|
||||
import Test
|
||||
import MainGame
|
||||
|
||||
instance StateMachine State UserData where
|
||||
smLoad Menu = loadMap
|
||||
smLoad Main = loadMap
|
||||
|
||||
smLoad Load = loadLoad
|
||||
|
||||
smUpdate Menu = updateMap
|
||||
smUpdate Main = updateMap
|
||||
|
||||
smUpdate Load = updateLoad
|
||||
|
||||
smDraw Menu = drawMap
|
||||
smDraw Main = drawMap
|
||||
|
||||
smDraw Load = drawLoad
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ data StateData
|
|||
{ loadAssetImages :: Map ImgId Image
|
||||
, loadAssetAnims :: Map AnimId Animation
|
||||
}
|
||||
| MenuData
|
||||
| MainData
|
||||
{ mapMat :: Matrix TileState
|
||||
, imgMat :: Matrix (Maybe ImgId)
|
||||
, reachPoints :: [ReachPoint]
|
||||
|
|
|
@ -44,7 +44,7 @@ data UserData = UserData
|
|||
|
||||
data State
|
||||
= Load
|
||||
| Menu
|
||||
| Main
|
||||
| Test
|
||||
|
||||
data Entity f = Entity
|
||||
|
|
|
@ -33,7 +33,7 @@ executable tracer-game
|
|||
, Interior
|
||||
, Init
|
||||
, Load
|
||||
, Test
|
||||
, MainGame
|
||||
, Navigation
|
||||
, MindMap
|
||||
, NPC
|
||||
|
|
Loading…
Reference in a new issue