Cleanup, add unpause clock
This commit is contained in:
@@ -6,26 +6,24 @@
|
||||
module Dodge.Data.CWorld (
|
||||
module Dodge.Data.CWorld,
|
||||
module Dodge.Data.LWorld,
|
||||
module Dodge.Data.Camera
|
||||
module Dodge.Data.Camera,
|
||||
) where
|
||||
|
||||
import Data.Tile
|
||||
import Geometry.Data
|
||||
import Dodge.Data.LWorld
|
||||
import Control.Lens
|
||||
import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
--import Dodge.Data.GenParams
|
||||
import Data.Graph.Inductive
|
||||
import Data.Tile
|
||||
import Dodge.Data.Camera
|
||||
import Dodge.Data.LWorld
|
||||
import Dodge.GameRoom
|
||||
import Geometry.ConvexPoly
|
||||
import Dodge.Data.Camera
|
||||
import Data.Graph.Inductive
|
||||
import Geometry.Data
|
||||
|
||||
data CWorld = CWorld
|
||||
{ _lWorld :: LWorld
|
||||
, _cwGen :: CWGen
|
||||
, _cClock :: Int
|
||||
-- , _seenWalls :: IS.IntSet
|
||||
, _cwTiles :: [Tile]
|
||||
, _pathGraph :: Gr Point2 PathEdge
|
||||
, _numberFloorVerxs :: Int
|
||||
@@ -41,7 +39,6 @@ data CWGen = CWGen
|
||||
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
|
||||
makeLenses ''CWorld
|
||||
makeLenses ''CWGen
|
||||
concat
|
||||
@@ -49,5 +46,5 @@ concat
|
||||
(deriveJSON defaultOptions)
|
||||
[ ''CWGen
|
||||
, ''CWorld
|
||||
-- , ''TimeFlowStatus
|
||||
-- , ''TimeFlowStatus
|
||||
]
|
||||
|
||||
@@ -51,6 +51,7 @@ data World = World
|
||||
, _peZoning :: IntMap (IntMap (Set PathEdgeNodes))
|
||||
, _gsZoning :: IntMap (IntMap IntSet)
|
||||
, _wCam :: Camera
|
||||
, _unpauseClock :: Int
|
||||
}
|
||||
|
||||
data TimeFlowStatus
|
||||
|
||||
Reference in New Issue
Block a user