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.
Even less craziness server_refactor
authorunc0rr
Mon, 10 Jan 2011 18:29:43 +0300
branchserver_refactor
changeset 4577 2c43cd7d5ce6
parent 4575 4eb51a884f11
child 4579 4e61c2a42121
Even less craziness
gameServer/HWProtoNEState.hs file | annotate | diff | comparison | revisions 
--- a/gameServer/HWProtoNEState.hs	Mon Jan 10 18:28:39 2011 +0300
+++ b/gameServer/HWProtoNEState.hs	Mon Jan 10 18:29:43 2011 +0300
@@ -20,7 +20,7 @@
     let cl = irnc `client` ci
     if not . B.null $ nick cl then return [ProtocolError "Nickname already chosen"]
         else
-        if haveSameNick irnc (nick cl) then return [AnswerClients [sendChan cl] ["WARNING", "Nickname already in use"], ByeClient ""]
+        if haveSameNick irnc then return [AnswerClients [sendChan cl] ["WARNING", "Nickname already in use"], ByeClient ""]
             else
             if illegalName newNick then return [ByeClient "Illegal nickname"]
                 else
@@ -29,7 +29,7 @@
                     AnswerClients [sendChan cl] ["NICK", newNick] :
                     [CheckRegistered | clientProto cl /= 0]
     where
-    haveSameNick irnc clNick = isJust $ find (\cl -> newNick == cl) $ map (nick . client irnc) $ allClients irnc
+    haveSameNick irnc = isJust . find (== newNick) . map (nick . client irnc) $ allClients irnc
 
 handleCmd_NotEntered ["PROTO", protoNum] = do
     (ci, irnc) <- ask
hedgewars