Mostly use String instead of Text
This commit is contained in:
@@ -10,7 +10,6 @@ import Dodge.Data.Button
|
||||
import Dodge.Data.FloorItem
|
||||
import Control.Lens
|
||||
import Geometry.Data
|
||||
import qualified Data.Text as T
|
||||
|
||||
data HUDElement
|
||||
= DisplayInventory
|
||||
@@ -22,7 +21,7 @@ data HUDElement
|
||||
data SubInventory
|
||||
= NoSubInventory
|
||||
| ExamineInventory {_subInvSel :: Maybe Int}
|
||||
| CombineInventory {_subInvSel :: Maybe Int, _subInvRegex :: T.Text
|
||||
| CombineInventory {_subInvSel :: Maybe Int, _subInvRegex :: String
|
||||
, _subInvRegexInput :: Bool}
|
||||
| LockedInventory
|
||||
| DisplayTerminal {_termID :: Int}
|
||||
|
||||
@@ -36,7 +36,7 @@ data Input = Input
|
||||
, _lSelect :: Point2
|
||||
, _rSelect :: Point2
|
||||
, _clickMousePos :: Point2
|
||||
, _textInput :: T.Text
|
||||
, _textInput :: String
|
||||
, _scrollTestValue :: Float
|
||||
}
|
||||
|
||||
|
||||
@@ -46,6 +46,11 @@ data SelectionItem a = SelectionItem
|
||||
}
|
||||
| SelectionFilter
|
||||
{ _siPictures :: [String]
|
||||
, _siHeight :: Int
|
||||
, _siIsSelectable :: Bool
|
||||
, _siWidth :: Int
|
||||
, _siColor :: Color
|
||||
, _siOffX :: Int
|
||||
}
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@ import Control.Lens
|
||||
import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
import qualified Data.Map.Strict as M
|
||||
import qualified Data.Text as T
|
||||
import Dodge.Data.WorldEffect
|
||||
|
||||
data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
|
||||
@@ -18,7 +17,7 @@ data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data TerminalInput = TerminalInput
|
||||
{ _tiText :: T.Text
|
||||
{ _tiText :: String
|
||||
, _tiFocus :: Bool
|
||||
, _tiSel :: (Int, Int)
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ data ScreenLayer
|
||||
, _scListDisplayParams :: ListDisplayParams
|
||||
}
|
||||
| InputScreen
|
||||
{ _scInput :: T.Text
|
||||
{ _scInput :: String
|
||||
, _scFooter :: String
|
||||
}
|
||||
-- | WaitScreen
|
||||
|
||||
Reference in New Issue
Block a user