summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-06-06 02:45:41 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-06-06 02:45:41 +0200
commite42a30cd80ddf2202af0c690152b59350a4f1097 (patch)
treea18d0bc560e54cf24f57be608adb8c5f909472cb /src
parent54624cecd73a0b1ae3b8c6de41808ca02b31179e (diff)
download2017-01-16_17:13:37-e42a30cd80ddf2202af0c690152b59350a4f1097.tar
2017-01-16_17:13:37-e42a30cd80ddf2202af0c690152b59350a4f1097.tar.gz
2017-01-16_17:13:37-e42a30cd80ddf2202af0c690152b59350a4f1097.tar.bz2
2017-01-16_17:13:37-e42a30cd80ddf2202af0c690152b59350a4f1097.tar.xz
2017-01-16_17:13:37-e42a30cd80ddf2202af0c690152b59350a4f1097.zip
MOAR generality
Diffstat (limited to 'src')
-rw-r--r--src/Sequence/Types.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Sequence/Types.hs b/src/Sequence/Types.hs
index 480dfee..3d95b9a 100644
--- a/src/Sequence/Types.hs
+++ b/src/Sequence/Types.hs
@@ -1,4 +1,4 @@
1{-# LANGUAGE FlexibleInstances, FlexibleContexts, MultiParamTypeClasses, TypeSynonymInstances, ViewPatterns, OverloadedStrings, TemplateHaskell, GeneralizedNewtypeDeriving, TypeOperators #-} 1{-# LANGUAGE FlexibleInstances, FlexibleContexts, MultiParamTypeClasses, TypeSynonymInstances, ViewPatterns, OverloadedStrings, TemplateHaskell, GeneralizedNewtypeDeriving, TypeOperators, UndecidableInstances #-}
2 2
3module Sequence.Types 3module Sequence.Types
4 ( GameState, gEntities, gEntityNames, gFocus, gNextId' 4 ( GameState, gEntities, gEntityNames, gFocus, gNextId'
@@ -78,8 +78,8 @@ instance Default Entity where
78 , _eStats = def 78 , _eStats = def
79 } 79 }
80 80
81instance Stats :<: Entity where 81instance (Entity :<: a) => Stats :<: a where
82 ctx' = eStats 82 ctx' = ctx' . eStats
83 83
84newtype EntityName = EntityName { _entityName :: CI String } 84newtype EntityName = EntityName { _entityName :: CI String }
85 deriving (Show, Eq, Ord) 85 deriving (Show, Eq, Ord)