diff -r 33ab77c0b486 -r 87410ae372f6 gameServer/Actions.hs --- a/gameServer/Actions.hs Fri Jan 18 11:47:23 2013 +0100 +++ b/gameServer/Actions.hs Sat Jan 19 00:51:28 2013 +0400 @@ -426,7 +426,7 @@ haveSameNick <- liftM (not . null . tail . filter (\c -> (not $ isChecker c) && caseInsensitiveCompare (nick c) n)) allClientsS if haveSameNick && (not checker) then if p < 38 then - processAction $ ByeClient "Nickname is already in use" + processAction $ ByeClient $ loc "Nickname is already in use" else processAction $ NoticeMessage NickAlreadyInUse else @@ -459,11 +459,11 @@ isBanned = do processAction $ CheckBanned False liftM B.null $ client's nick - checkerLogin _ False = processAction $ ByeClient "No checker rights" + checkerLogin _ False = processAction $ ByeClient $ loc "No checker rights" checkerLogin p True = do wp <- client's webPassword processAction $ - if wp == p then ModifyClient $ \c -> c{logonPassed = True} else ByeClient "Authentication failed" + if wp == p then ModifyClient $ \c -> c{logonPassed = True} else ByeClient $ loc "Authentication failed" playerLogin p a = do chan <- client's sendChan mapM_ processAction [AnswerClients [chan] ["ASKPASSWORD"], ModifyClient (\c -> c{webPassword = p, isAdministrator = a})] @@ -494,7 +494,7 @@ clHost <- client's host currentTime <- io getCurrentTime mapM_ processAction [ - AddIP2Bans clHost "60 seconds cooldown after kick" (addUTCTime 60 currentTime) + AddIP2Bans clHost (loc "60 seconds cooldown after kick") (addUTCTime 60 currentTime) , ModifyClient (\c -> c{isKickedFromServer = True}) , ByeClient "Kicked" ] @@ -550,7 +550,7 @@ processAction (KickRoomClient kickId) = do modify (\s -> s{clientIndex = Just kickId}) ch <- client's sendChan - mapM_ processAction [AnswerClients [ch] ["KICKED"], MoveToLobby "kicked"] + mapM_ processAction [AnswerClients [ch] ["KICKED"], MoveToLobby $ loc "kicked"] processAction (AddClient cl) = do @@ -613,7 +613,7 @@ pq <- io $ client'sM rnc pingsQueue ci when (pq > 0) $ do withStateT (\as -> as{clientIndex = Just ci}) $ - processAction (ByeClient "Ping timeout") + processAction (ByeClient $ loc "Ping timeout") -- when (pq > 1) $ -- processAction $ DeleteClient ci -- smth went wrong with client io threads, issue DeleteClient here