avoided some ambiguous function calls
authorJonathan@Jonathan-PC.fritz.box
Wed, 06 Apr 2011 11:51:23 +0200
changeset 5112 4e2ebd8ac298
parent 5111 d8856d98ce7d
child 5113 d92b58d100ae
avoided some ambiguous function calls
QTfrontend/hwform.cpp
QTfrontend/selectWeapon.cpp
--- a/QTfrontend/hwform.cpp	Wed Apr 06 00:30:02 2011 +0200
+++ b/QTfrontend/hwform.cpp	Wed Apr 06 11:51:23 2011 +0200
@@ -310,7 +310,7 @@
   if (value)
     setWindowState(windowState() | Qt::WindowFullScreen);
   else {
-    setWindowState(windowState() & !Qt::WindowFullScreen);
+    setWindowState(windowState() & static_cast<int>(!Qt::WindowFullScreen));
   }
 }
 
--- a/QTfrontend/selectWeapon.cpp	Wed Apr 06 00:30:02 2011 +0200
+++ b/QTfrontend/selectWeapon.cpp	Wed Apr 06 11:51:23 2011 +0200
@@ -35,7 +35,7 @@
 QImage getAmmoImage(int num)
 {
     static QImage ammo(":Ammos.png");
-    int x = floor(num/(ammo.height()/32));
+    int x = num/(ammo.height()/32);
     int y = (num-((ammo.height()/32)*x))*32;
     x*=32;
     return ammo.copy(x, y, 32, 32);