From 386a2b4732f6d743d5acd78b0e650463fd8ad21e Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 21 Aug 2022 10:25:00 +0100 Subject: [PATCH] Working compilation with some Flat instances --- src/Dodge/Data/Machine.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Dodge/Data/Machine.hs b/src/Dodge/Data/Machine.hs index 38efcffe4..fecfad67d 100644 --- a/src/Dodge/Data/Machine.hs +++ b/src/Dodge/Data/Machine.hs @@ -45,14 +45,16 @@ data Machine = Machine , _mcCloseSound :: Maybe SoundID , _mcWidth :: Float } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data MachineType = McStatic | McTerminal | McSensor Sensor | McTurret Turret - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data Turret = Turret { _tuWeapon :: Item @@ -60,7 +62,8 @@ data Turret = Turret , _tuFireTime :: Int , _tuDir :: Float } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) makeLenses ''Machine makeLenses ''Turret