Commit before pushing more input events into update

src/Dodge/Data/CWorld.hs

@@ -6,6 +6,7 @@
 module Dodge.Data.CWorld (
     module Dodge.Data.CWorld,
     module Dodge.Data.LWorld,
+    module Dodge.Data.CamPos
 ) where
 
 import Dodge.Data.LWorld
@@ -15,11 +16,13 @@ import Data.Aeson.TH
 --import Dodge.Data.GenParams
 import Dodge.GameRoom
 import Geometry.ConvexPoly
+import Dodge.Data.CamPos
 
 data CWorld = CWorld
     { _lWorld :: LWorld
+    , _camPos :: CamPos
     , _cwGen :: CWGen
-    , _cwClock :: Int
+    , _cClock :: Int
     , _pastWorlds :: [LWorld]
     , _timeFlow :: TimeFlowStatus
     }

src/Dodge/Data/Input.hs

@@ -9,6 +9,7 @@ import qualified Data.Set as S
 import Dodge.Data.CWorld
 import Geometry.Data
 import SDL (MouseButton, Scancode)
+import qualified Data.Text as T
 
 data Input = Input
     { _mousePos :: Point2
@@ -24,10 +25,15 @@ data Input = Input
     , _rSelect :: Point2
     , _clickMousePos :: Point2
     , _backspaceTimer :: Int
+    , _textInput :: TextInput
     }
+data TextInput = RejectTextInput
+    | AcceptTextInput {_textInputText :: T.Text}
+
 data WorldHammer
     = SubInvHam
     | DoubleMouseHam
     deriving (Eq, Ord, Show, Read, Enum, Bounded)
 
 makeLenses ''Input
+makeLenses ''TextInput

src/Dodge/Data/LWorld.hs

@@ -45,10 +45,8 @@ module Dodge.Data.LWorld (
     module Dodge.Data.TractorBeam,
     module Dodge.Data.Wall,
     module Dodge.Data.WorldEffect,
-    module Dodge.Data.CamPos
 ) where
 
-import Dodge.Data.CamPos
 import Data.Set (Set)
 import Control.Lens
 import Data.Aeson
@@ -100,8 +98,7 @@ import qualified IntMapHelp as IM
 import Picture.Data
 
 data LWorld = LWorld
-    { _camPos :: CamPos
-    , _creatures :: IM.IntMap Creature
+    { _creatures :: IM.IntMap Creature
     , _crZoning :: IM.IntMap (IM.IntMap IS.IntSet)
     , _creatureGroups :: IM.IntMap CrGroupParams
     , _itemLocations :: IM.IntMap ItemLocation