diff --git a/src/Dodge/Render/List.hs b/src/Dodge/Render/List.hs index 34d1b4d6b..f91c8a2b2 100644 --- a/src/Dodge/Render/List.hs +++ b/src/Dodge/Render/List.hs @@ -4,7 +4,6 @@ module Dodge.Render.List ( renderListAt, drawList, drawSelectionList, - drawSelectionListBackground, drawListYgapScaleYoff, drawListElement, dShadCol, @@ -55,20 +54,6 @@ drawTitleBackground cfig = . reverse $ rectNSWE 70 0 0 560 -drawSelectionListBackground :: - LDParams -> - Config -> - Int -> -- list length - Picture -drawSelectionListBackground ldp cfig l = - translateScreenPos cfig (ldp ^. ldpPos) - . polygon - . reverse - $ rectNSWE 5 s (-5) e - where - s = -(5 + fromIntegral l * (20 * ldp ^. ldpScale + ldp ^. ldpVerticalGap)) - e = 555 -- HACK isOverTerminalScreen - makeSelectionListPictures :: [SelectionItem a] -> [Picture] makeSelectionListPictures = concatMap f where diff --git a/src/Dodge/Terminal.hs b/src/Dodge/Terminal.hs index bce493d30..1e4602966 100644 --- a/src/Dodge/Terminal.hs +++ b/src/Dodge/Terminal.hs @@ -37,8 +37,8 @@ textTerminal = defaultTerminal{_tmBootLines = textInputBlurb []} textInputBlurb :: [TerminalLine] -> [TerminalLine] textInputBlurb tls = [termSoundLine computerBeepingS] - ++ tls - ++ tlSetStatus (TerminalTextInput "") + <> tls + <> tlSetStatus (TerminalTextInput "") termSoundLine :: SoundID -> TerminalLine termSoundLine = TLine 0 [] . TmWdWdTermSound diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 992790fa0..c4a8abf0a 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -409,6 +409,7 @@ updateKeysTextInputTerminal tmid u = (uvWorld . cWorld . lWorld . terminals . ix tmid . tmStatus . tiText) & checkEndStatus & tryTabComplete + & uvWorld . cWorld . lWorld . terminals . ix tmid . tmStatus . tiText %~ take 42 where checkEndStatus | u ^. uvWorld . input . pressedKeys . at ScancodeReturn == Just 0 =