Start moving hotkeys out from creatures into world
This commit is contained in:
@@ -57,7 +57,7 @@ data Creature = Creature
|
||||
-- , _crInvEquipped :: IM.IntMap EquipPosition
|
||||
, _crEquipment :: M.Map EquipPosition Int
|
||||
, _crInvHotkeys :: IM.IntMap Hotkey
|
||||
, _crHotkeys :: M.Map Hotkey Int
|
||||
-- , _crHotkeys :: M.Map Hotkey Int
|
||||
, _crState :: CreatureState
|
||||
, _crCorpse :: CreatureCorpse --Creature -> Corpse -> SPic
|
||||
, _crMaterial :: Material
|
||||
|
||||
@@ -92,6 +92,7 @@ import Dodge.Data.WorldEffect
|
||||
import Geometry.Data
|
||||
import qualified IntMapHelp as IM
|
||||
import Picture.Data
|
||||
import qualified Data.Map.Strict as M
|
||||
|
||||
data LWorld = LWorld
|
||||
{ _creatures :: IM.IntMap Creature
|
||||
@@ -141,6 +142,7 @@ data LWorld = LWorld
|
||||
, _lClock :: Int
|
||||
, _lTestString :: [String]
|
||||
, _lTestInt :: Int
|
||||
, _hotkeys :: M.Map Hotkey Int
|
||||
}
|
||||
--data WorldBeams = WorldBeams
|
||||
-- { _blockingBeams :: [Beam]
|
||||
|
||||
Reference in New Issue
Block a user