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.
Tweak error messages of /callvote kick
authorWuzzy <Wuzzy2@mail.ru>
Fri, 26 Oct 2018 19:40:43 +0200
changeset 13991 4ae01eabf611
parent 13990 b9b1d74b7fef
child 13992 863604736cf5
Tweak error messages of /callvote kick
gameServer/HWProtoInRoomState.hs file | annotate | diff | comparison | revisions 
--- a/gameServer/HWProtoInRoomState.hs	Fri Oct 26 19:53:07 2018 +0200
+++ b/gameServer/HWProtoInRoomState.hs	Fri Oct 26 19:40:43 2018 +0200
@@ -455,7 +455,14 @@
 
 handleCmd_inRoom ["CALLVOTE", "KICK"] = do
     cl <- thisClient
-    return [AnswerClients [sendChan cl] ["CHAT", nickServer, loc "/callvote kick: You need to specify a nickname."]]
+    rm <- thisRoom
+    return
+        [AnswerClients [sendChan cl] ["CHAT", nickServer,
+        if isJust $ masterID rm then
+            loc "/callvote kick: This is only allowed in rooms without a room master."
+        else
+            loc "/callvote kick: You need to specify a nickname."
+        ]]
 
 handleCmd_inRoom ["CALLVOTE", "KICK", nickname] = do
     (thisClientId, rnc) <- ask
hedgewars