# HG changeset patch # User unc0rr # Date 1375386774 -14400 # Node ID 90f9d8046a86a799fb26d77bc4be74eadfb17d82 # Parent 563ab624522c2cb6675bd32e00e422570398071e Fix silliness from r3f4c3fc146c2 (was I sleepy?) diff -r 563ab624522c -r 90f9d8046a86 CMakeLists.txt --- a/CMakeLists.txt Sat Jul 27 04:20:49 2013 +0200 +++ b/CMakeLists.txt Thu Aug 01 23:52:54 2013 +0400 @@ -205,3 +205,4 @@ include(${CMAKE_MODULE_PATH}/cpackvars.cmake) +message(${CMAKE_SYSTEM_NAME}) diff -r 563ab624522c -r 90f9d8046a86 gameServer/Actions.hs --- a/gameServer/Actions.hs Sat Jul 27 04:20:49 2013 +0200 +++ b/gameServer/Actions.hs Thu Aug 01 23:52:54 2013 +0400 @@ -346,7 +346,8 @@ ModifyRoom (\r -> r{ gameInfo = liftM (\g -> g{ teamsInGameNumber = teamsInGameNumber g - 1 - , roundMsgs = rmTeamMsg : roundMsgs g + , roundMsgs = (if isJust $ lastFilteredTimedMsg g then (:) (fromJust $ lastFilteredTimedMsg g) else id) + $ rmTeamMsg : roundMsgs g }) $ gameInfo r }) ] diff -r 563ab624522c -r 90f9d8046a86 gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Sat Jul 27 04:20:49 2013 +0200 +++ b/gameServer/HWProtoLobbyState.hs Thu Aug 01 23:52:54 2013 +0400 @@ -118,10 +118,7 @@ AnswerClients [sendChan cl] ["RUN_GAME"] : AnswerClients chans ["CLIENT_FLAGS", "+g", nick cl] : ModifyClient (\c -> c{isInGame = True}) - : (AnswerClients [sendChan cl] $ "EM" : toEngineMsg "e$spectate 1" : (reverse . roundMsgs . fromJust . gameInfo $ jRoom)) - : [AnswerClients [sendChan cl] $ "EM" : [fromJust msg] | isJust msg] - where - msg = lastFilteredTimedMsg . fromJust . gameInfo $ jRoom + : [AnswerClients [sendChan cl] $ "EM" : toEngineMsg "e$spectate 1" : (reverse . roundMsgs . fromJust . gameInfo $ jRoom)] handleCmd_lobby ["JOIN_ROOM", roomName] =