# HG changeset patch
# User Jonathan@Jonathan-PC.fritz.box
# Date 1302083483 -7200
# Node ID 4e2ebd8ac2987aa0f62ffa1cd82bd5d7c998c281
# Parent  d8856d98ce7d11aa7a82bd7b1a43db729ed5c530
avoided some ambiguous function calls

diff -r d8856d98ce7d -r 4e2ebd8ac298 QTfrontend/hwform.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));
   }
 }
 
diff -r d8856d98ce7d -r 4e2ebd8ac298 QTfrontend/selectWeapon.cpp
--- 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);