about summary refs log tree commit diff
path: root/src/Xanthous/Game
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2020-02-17T18·24-0500
committerGriffin Smith <root@gws.fyi>2020-02-17T18·24-0500
commit1265155ae43f59c6bbd4b25f2747515cdf416622 (patch)
treed69e2638c49383308bfdd8641f0562365ab71ed2 /src/Xanthous/Game
parent69ccf3a77de7b11ea1c8c11d96ae14595b204589 (diff)
Don't run initEvent when loading the game
Rather than having a single sentWelcome boolean, avoid running the
initEvent entirely when loading an already-initialized game. Among other
things, this stops us from re-generating a level and then merging it
with the existing one when the game is loaded (oops).
Diffstat (limited to 'src/Xanthous/Game')
-rw-r--r--src/Xanthous/Game/Arbitrary.hs1
-rw-r--r--src/Xanthous/Game/Lenses.hs1
-rw-r--r--src/Xanthous/Game/State.hs3
3 files changed, 0 insertions, 5 deletions
diff --git a/src/Xanthous/Game/Arbitrary.hs b/src/Xanthous/Game/Arbitrary.hs
index 4a64a12be096..886a8c03d786 100644
--- a/src/Xanthous/Game/Arbitrary.hs
+++ b/src/Xanthous/Game/Arbitrary.hs
@@ -40,7 +40,6 @@ instance Arbitrary GameState where
     let _promptState = NoPrompt -- TODO
     _activePanel <- arbitrary
     _debugState <- arbitrary
-    _sentWelcome <- arbitrary
     pure $ GameState {..}
 
 
diff --git a/src/Xanthous/Game/Lenses.hs b/src/Xanthous/Game/Lenses.hs
index dc886f65c698..017d53652c4f 100644
--- a/src/Xanthous/Game/Lenses.hs
+++ b/src/Xanthous/Game/Lenses.hs
@@ -56,7 +56,6 @@ initialStateFromSeed seed =
       _debugState = DebugState
         { _allRevealed = False
         }
-      _sentWelcome = False
   in GameState {..}
 
 
diff --git a/src/Xanthous/Game/State.hs b/src/Xanthous/Game/State.hs
index 100204c755c3..80137df7a721 100644
--- a/src/Xanthous/Game/State.hs
+++ b/src/Xanthous/Game/State.hs
@@ -12,7 +12,6 @@ module Xanthous.Game.State
   , messageHistory
   , randomGen
   , activePanel
-  , sentWelcome
   , promptState
   , characterEntityID
   , GamePromptState(..)
@@ -434,7 +433,6 @@ data GameState = GameState
   , _characterEntityID :: !EntityID
   , _messageHistory    :: !MessageHistory
   , _randomGen         :: !StdGen
-  , _sentWelcome       :: Bool
 
     -- | The active panel displayed in the UI, if any
   , _activePanel       :: !(Maybe Panel)
@@ -463,7 +461,6 @@ instance Eq GameState where
     , gs ^. revealedPositions
     , gs ^. characterEntityID
     , gs ^. messageHistory
-    , gs ^. sentWelcome
     , gs ^. activePanel
     , gs ^. debugState
     )