# HG changeset patch # User unc0rr # Date 1391157951 -14400 # Node ID a92a4ba39a79bc8388a487dffadbedcb8cebddaa # Parent 213c38232b3daed7ae5138e18c0ce9c1d2fef58f Fix build diff -r 213c38232b3d -r a92a4ba39a79 gameServer/Actions.hs --- a/gameServer/Actions.hs Thu Jan 30 16:08:05 2014 +0400 +++ b/gameServer/Actions.hs Fri Jan 31 12:45:51 2014 +0400 @@ -33,6 +33,7 @@ import Consts import ConfigFile import EngineInteraction +import FloodDetection type CmdHandler = [B.ByteString] -> Reader (ClientIndex, IRnC) [Action] diff -r 213c38232b3d -r a92a4ba39a79 gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Thu Jan 30 16:08:05 2014 +0400 +++ b/gameServer/HWProtoInRoomState.hs Fri Jan 31 12:45:51 2014 +0400 @@ -55,8 +55,8 @@ s <- roomOthersChans return [AnswerClients s ["CHAT", n, msg]] -handleCmd_inRoom ["PART"] = return [MoveToLobby "part"] -handleCmd_inRoom ["PART", msg] = return [MoveToLobby $ "part: " `B.append` msg] +handleCmd_inRoom ["PART"] = return [MoveToLobby "part", RegisterEvent RoomJoin] +handleCmd_inRoom ["PART", msg] = return [MoveToLobby $ "part: " `B.append` msg, RegisterEvent RoomJoin] handleCmd_inRoom ("CFG" : paramName : paramStrs) @@ -240,7 +240,7 @@ (\g -> g{ roundMsgs = if B.null nonEmptyMsgs then roundMsgs g else nonEmptyMsgs : roundMsgs g , lastFilteredTimedMsg = fromMaybe (lastFilteredTimedMsg g) lastFTMsg}) - $ gameInfo r})] + $ gameInfo r}), RegisterEvent EngineMessage] else return [] where diff -r 213c38232b3d -r a92a4ba39a79 gameServer/HWProtoLobbyState.hs --- a/gameServer/HWProtoLobbyState.hs Thu Jan 30 16:08:05 2014 +0400 +++ b/gameServer/HWProtoLobbyState.hs Fri Jan 31 12:45:51 2014 +0400 @@ -27,7 +27,7 @@ handleCmd_lobby ["CHAT", msg] = do n <- clientNick s <- roomOthersChans - return [AnswerClients s ["CHAT", n, msg]] + return [AnswerClients s ["CHAT", n, msg], RegisterEvent LobbyChatMessage] handleCmd_lobby ["CREATE_ROOM", rName, roomPassword] | illegalName rName = return [Warning $ loc "Illegal room name"] diff -r 213c38232b3d -r a92a4ba39a79 gameServer/hedgewars-server.cabal --- a/gameServer/hedgewars-server.cabal Thu Jan 30 16:08:05 2014 +0400 +++ b/gameServer/hedgewars-server.cabal Fri Jan 31 12:45:51 2014 +0400 @@ -30,6 +30,7 @@ deepseq, utf8-string, SHA, - entropy + entropy, + zlib ghc-options: -O2