Correct loading of tile buffer when loading game

This commit is contained in:
2023-03-25 22:31:28 +00:00
parent da8a2bad6e
commit acc55f8d16
9 changed files with 114 additions and 117 deletions
+12 -14
View File
@@ -1,5 +1,5 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE StrictData #-}
{-# LANGUAGE TemplateHaskell #-}
@@ -13,24 +13,25 @@ module Dodge.Data.World (
module Dodge.Data.Input,
) where
import Geometry.Data
import Control.Lens
import Data.IntMap.Strict (IntMap)
import Data.IntSet (IntSet)
import Data.Set (Set)
import Dodge.Data.SaveSlot
import Control.Lens
import qualified Data.Map.Strict as M
import Data.Set (Set)
import Dodge.Data.CWorld
import Dodge.Data.Hammer
import Dodge.Data.Input
import Dodge.Data.RightButtonOptions
import Dodge.Data.SaveSlot
import Dodge.Data.SoundOrigin
import Geometry.Data
import Sound.Data
import System.Random
data WorldEventFlag = InventoryChange
data WorldEventFlag
= InventoryChange
| CombineInventoryChange
deriving (Eq,Ord,Enum,Bounded)
deriving (Eq, Ord, Enum, Bounded)
data World = World
{ _cWorld :: CWorld
@@ -54,25 +55,22 @@ data World = World
data TimeFlowStatus
= DeathTime
{ _deathDelay :: Int }
{_deathDelay :: Int}
| NormalTimeFlow
| ScrollTimeFlow
{ _scrollSmoothing :: Int
{ _scrollSmoothing :: Int
, _reverseAmount :: Int
, _futureWorlds :: [LWorld]
, _scrollItemLocation :: Int
}
| RewindLeftClick
{ _reverseAmount :: Int
{ _reverseAmount :: Int
, _scrollItemLocation :: Int
}
| PausedTimeFlow
{ _timeFlowCharge :: Int
{ _timeFlowCharge :: Int
, _scrollItemLocation :: Int
}
-- deriving (Eq, Ord, Show, Read) --Generic, Flat)
makeLenses ''TimeFlowStatus
makeLenses ''World