# HG changeset patch
# User nemo
# Date 1421610503 18000
# Node ID f7cdca3ed69701961af25e762f56686163d63630
# Parent  ace862eda1921be0589d18af8fa84f3764729ff4# Parent  5672d43e8d8808d7f7a86e2e74130c8db7d0ba9b
merge

diff -r ace862eda192 -r f7cdca3ed697 QTfrontend/model/playerslistmodel.cpp
--- a/QTfrontend/model/playerslistmodel.cpp	Sun Jan 18 14:47:25 2015 -0500
+++ b/QTfrontend/model/playerslistmodel.cpp	Sun Jan 18 14:48:23 2015 -0500
@@ -237,6 +237,7 @@
         << index.data(InGame).toBool()
         << index.data(RoomFilterRole).toBool()
         << index.data(InRoom).toBool()
+        << index.data(Contributor).toBool()
         ;
 
     for(int i = flags.size() - 1; i >= 0; --i)
diff -r ace862eda192 -r f7cdca3ed697 QTfrontend/model/playerslistmodel.h
--- a/QTfrontend/model/playerslistmodel.h	Sun Jan 18 14:47:25 2015 -0500
+++ b/QTfrontend/model/playerslistmodel.h	Sun Jan 18 14:48:23 2015 -0500
@@ -23,6 +23,8 @@
         InGame      = Qt::UserRole + 6,
         InRoom      = Qt::UserRole + 7,
         Contributor = Qt::UserRole + 8
+        // if you add a role that will affect the player icon,
+        // then also add it to the flags Qlist in updateIcon()!
     };
 
     enum SpecialRoles {
diff -r ace862eda192 -r f7cdca3ed697 hedgewars/uGearsHandlersMess.pas
--- a/hedgewars/uGearsHandlersMess.pas	Sun Jan 18 14:47:25 2015 -0500
+++ b/hedgewars/uGearsHandlersMess.pas	Sun Jan 18 14:48:23 2015 -0500
@@ -1868,7 +1868,7 @@
                     DeleteGear(Gear);
                     exit
                     end;
-                Gear^.State:= Gear^.State and not gstAttacking;
+                Gear^.State:= Gear^.State and (not gstAttacking);
                 Gear^.Timer:= Gear^.WDTimer
                 end;
             dec(Gear^.Timer);