Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gameServer/HWProtoNEState.hs
changeset 2747 7889a3a9724f
parent 2352 7eaf82cf0890
child 2867 9be6693c78cb 
--- a/gameServer/HWProtoNEState.hs	Thu Feb 04 18:46:49 2010 +0000
+++ b/gameServer/HWProtoNEState.hs	Thu Feb 04 20:45:03 2010 +0000
@@ -13,7 +13,7 @@
 
 handleCmd_NotEntered clID clients _ ["NICK", newNick]
 	| not . null $ nick client = [ProtocolError "Nickname already chosen"]
-	| haveSameNick = [AnswerThisClient ["WARNING", "Nickname collision"], ByeClient ""]
+	| haveSameNick = [AnswerThisClient ["WARNING", "Nickname already in use"], ByeClient ""]
 	| illegalName newNick = [ByeClient "Illegal nickname"]
 	| otherwise =
 		ModifyClient (\c -> c{nick = newNick}) :
hedgewars