Working compilation with some Flat instances
This commit is contained in:
@@ -45,14 +45,16 @@ data Machine = Machine
|
|||||||
, _mcCloseSound :: Maybe SoundID
|
, _mcCloseSound :: Maybe SoundID
|
||||||
, _mcWidth :: Float
|
, _mcWidth :: Float
|
||||||
}
|
}
|
||||||
deriving (Eq, Show, Read, Generic, Flat)
|
deriving (Eq, Show, Read, Generic)
|
||||||
|
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||||
|
|
||||||
data MachineType
|
data MachineType
|
||||||
= McStatic
|
= McStatic
|
||||||
| McTerminal
|
| McTerminal
|
||||||
| McSensor Sensor
|
| McSensor Sensor
|
||||||
| McTurret Turret
|
| McTurret Turret
|
||||||
deriving (Eq, Show, Read, Generic, Flat)
|
deriving (Eq, Show, Read, Generic)
|
||||||
|
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||||
|
|
||||||
data Turret = Turret
|
data Turret = Turret
|
||||||
{ _tuWeapon :: Item
|
{ _tuWeapon :: Item
|
||||||
@@ -60,7 +62,8 @@ data Turret = Turret
|
|||||||
, _tuFireTime :: Int
|
, _tuFireTime :: Int
|
||||||
, _tuDir :: Float
|
, _tuDir :: Float
|
||||||
}
|
}
|
||||||
deriving (Eq, Show, Read, Generic, Flat)
|
deriving (Eq, Show, Read, Generic)
|
||||||
|
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||||
|
|
||||||
makeLenses ''Machine
|
makeLenses ''Machine
|
||||||
makeLenses ''Turret
|
makeLenses ''Turret
|
||||||
|
|||||||
Reference in New Issue
Block a user