PlayerAt is a NightMessage
authorJoachim Breitner <mail@joachim-breitner.de>
Fri, 4 Jul 2008 23:38:32 +0000 (23:38 +0000)
committerJoachim Breitner <mail@joachim-breitner.de>
Fri, 4 Jul 2008 23:38:32 +0000 (23:38 +0000)
Partty.hs

index a8ebcac..45312bf 100644 (file)
--- a/Partty.hs
+++ b/Partty.hs
@@ -38,13 +38,13 @@ data IncomingMessage = InternalMessage InternalMessage
 data DayMessage      = DayStarts
                      | DayEndsIn Int
                      | DayEnds
-                    | PlayerAt Player Place
                     deriving (Show, Eq)
 
 -- Events that we want to send to the user code and that
 -- can NOT be reacted upon
 data NightMessage    = Initialize
                     | PartyHint Place
+                    | PlayerAt Player Place
                     | NightStarts
                     | NightEndsIn Int
                     | NightEnds
@@ -209,11 +209,12 @@ parseIncomingMessage msg = case id of
        50 -> DayMessage      (DayStarts)
        51 -> DayMessage      (DayEndsIn int1)
        52 -> DayMessage      (DayEnds)
-       61 -> DayMessage      (PlayerAt s1 int2)
 
        53 -> NightMessage    (NightStarts)
        54 -> NightMessage    (NightEndsIn int1)
        55 -> NightMessage    (NightEnds)
+
+       61 -> NightMessage    (PlayerAt s1 int2)
        62 -> NightMessage    (GotScore NoScore)
        63 -> NightMessage    (GotScore ToFew)
        64 -> NightMessage    (GotScore Scored)