Merge in terminal changes

src/Dodge/Debug/Terminal.hs

@@ -1,12 +1,4 @@
 module Dodge.Debug.Terminal
-<<<<<<< HEAD
-    ( applyTerminalString
-    ) where
-import Dodge.Data
-import Dodge.Creature
-import Dodge.Creature.YourControl
-import Dodge.Creature.State
-=======
     where
 import           Dodge.Creature
 import           Dodge.Creature.State
@@ -14,7 +6,6 @@ import           Dodge.Creature.YourControl
 import           Dodge.Data
 import Dodge.Menu.PushPop
 import Control.Monad
->>>>>>> ross/loop-master
 
 import           Control.Lens
 import Text.Read (readMaybe)
@@ -26,22 +17,6 @@ import Graphics.Rendering.OpenGL.GL.Shaders (validateProgram)
 import Dodge.Data (Universe(Universe))
 
 applyTerminalString :: String -> Universe -> Universe
-<<<<<<< HEAD
-applyTerminalString str = case str of
-    "NOCLIP" -> config . debug_noclip %~ not
-    "LOADME" -> (uvWorld . creatures . ix 0 . crInv .~ stackedInventory)
-                    . (uvWorld . creatures . ix 0 . crInvCapacity .~ 50)
-    "GODON" -> uvWorld . creatures . ix 0 . crUpdate .~ stateUpdateDamage clearDamage yourControl
-    "GODOFF" -> uvWorld . creatures . ix 0 . crUpdate .~ stateUpdate yourControl
-    "LOADTEST" -> (uvWorld . creatures . ix 0 . crInv .~ testInventory)
-        . (uvWorld . creatures . ix 0 . crInvCapacity .~ 50)
-    "LM" -> applyTerminalString "LOADME"
-    "LT" -> applyTerminalString "LOADTEST"
-    _   -> loadme
-
-loadme :: a -> a
-loadme = id
-=======
 applyTerminalString "NOCLIP" = config . debug_noclip %~ not
 applyTerminalString "LOADME" = (uvWorld . creatures . ix 0 . crInv .~ stackedInventory)
     . (uvWorld . creatures . ix 0 . crInvCapacity .~ 50)
@@ -135,4 +110,3 @@ commonPrefix :: Eq a => [a] -> [a] -> [a]
 commonPrefix (x:xs) (y:ys)
     | x == y    = x : commonPrefix xs ys
 commonPrefix _ _ = []
->>>>>>> ross/loop-master