Mercurial Mercurial > hedgewars-draft / 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.
Eh, two players condition seems to make more sense than two clans here
authorunc0rr
Sun, 03 Mar 2013 23:25:09 +0400
changeset 8627 ea2d32a03ac9
parent 8625 d77090a8a35e
child 8629 76a265f3967c
Eh, two players condition seems to make more sense than two clans here
gameServer/HWProtoInRoomState.hs file | annotate | diff | comparison | revisions 
--- a/gameServer/HWProtoInRoomState.hs	Sun Mar 03 23:23:41 2013 +0400
+++ b/gameServer/HWProtoInRoomState.hs	Sun Mar 03 23:25:09 2013 +0400
@@ -305,14 +305,14 @@
     let kickId = fromJust maybeClientId
     let kickCl = rnc `client` kickId
     let sameRoom = clientRoom rnc thisClientId == clientRoom rnc kickId
-    let notOnly2Clans = (length . group . sort . map teamcolor . teams $ rm) > 2
+    let notOnly2Players = (length . group . sort . map teamowner . teams $ rm) > 2
     return
         [KickRoomClient kickId |
             master
             && isJust maybeClientId
             && (kickId /= thisClientId)
             && sameRoom
-            && ((isNothing $ gameInfo rm) || notOnly2Clans || teamsInGame kickCl == 0)
+            && ((isNothing $ gameInfo rm) || notOnly2Players || teamsInGame kickCl == 0)
         ]
hedgewars-draft