Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build
authorunc0rr
Fri, 31 Jan 2014 12:45:51 +0400
changeset 10092 a92a4ba39a79
parent 10091 213c38232b3d
child 10093 ada172d33988
Fix build
gameServer/Actions.hs file | annotate | diff | comparison | revisions
gameServer/HWProtoInRoomState.hs file | annotate | diff | comparison | revisions
gameServer/HWProtoLobbyState.hs file | annotate | diff | comparison | revisions
gameServer/hedgewars-server.cabal file | annotate | diff | comparison | revisions 
--- 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]
--- 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
--- 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"]
--- 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
hedgewars