# HG changeset patch
# User unc0rr
# Date 1431459513 -10800
# Node ID c4b3440eeac6759952497728e8657ada0604a14e
# Parent  d90706a2183e2d116464fd062e5f487cdc4fd84d
 - Fix order of messages, also don't duplicate last timestamped message
 - Comment out useless line in uTeams

diff -r d90706a2183e -r c4b3440eeac6 gameServer/Actions.hs
--- a/gameServer/Actions.hs	Tue May 12 22:09:25 2015 +0900
+++ b/gameServer/Actions.hs	Tue May 12 22:38:33 2015 +0300
@@ -381,8 +381,9 @@
         ModifyRoom (\r -> r{
                 gameInfo = liftM (\g -> g{
                     teamsInGameNumber = teamsInGameNumber g - 1
-                    , roundMsgs = (if isJust $ lastFilteredTimedMsg g then (:) (fromJust $ lastFilteredTimedMsg g) else id)
-                      $ rmTeamMsg : roundMsgs g
+                    , lastFilteredTimedMsg = Nothing
+                    , roundMsgs = (if isJust $ lastFilteredTimedMsg g then ((:) rmTeamMsg . (:) (fromJust $ lastFilteredTimedMsg g)) else ((:) rmTeamMsg)) 
+                        $ roundMsgs g
                 }) $ gameInfo r
             })
         ]
diff -r d90706a2183e -r c4b3440eeac6 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Tue May 12 22:09:25 2015 +0900
+++ b/hedgewars/uTeams.pas	Tue May 12 22:38:33 2015 +0300
@@ -678,7 +678,7 @@
         end
     else
         begin
-        TeamsArray[t]^.isGoneFlagPendingToBeSet:= true;
+        //TeamsArray[t]^.isGoneFlagPendingToBeSet:= true;
 
         if (not CurrentTeam^.ExtDriven) or (CurrentTeam^.TeamName = s) or (CurrentTeam^.hasGone) then
             ParseCommand('/teamgone s' + s, true)