hedgewars/uTouch.pas
changeset 6695 32de8965c62c
parent 6693 b6a69c0bc541
child 6698 804e9076d136
--- a/hedgewars/uTouch.pas	Fri Feb 17 09:33:03 2012 +0100
+++ b/hedgewars/uTouch.pas	Fri Feb 17 12:08:01 2012 +0100
@@ -50,7 +50,6 @@
 function fingerHasMoved(finger: TTouch_Data): boolean;
 function calculateDelta(finger1, finger2: TTouch_Data): hwFloat;
 function getSecondFinger(finger: TTouch_Data): PTouch_Data;
-function isOnRect(widget: TOnScreenWidget; finger: TTouch_Data): boolean;
 function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean;
 procedure printFinger(finger: TTouch_Data);
 implementation
@@ -99,48 +98,48 @@
                 exit;
             end;
 
-            if isOnRect(fireButton, finger^) then
+            if isOnRect(fireButton.active, finger^) then
             begin
                 stopFiring:= false;
                 spaceKey:= true;
                 exit;
             end;
-            if isOnRect(arrowLeft, finger^) then
+            if isOnRect(arrowLeft.active, finger^) then
             begin
                 leftKey:= true;
                 walkingLeft := true;
                 exit;
             end;
-            if isOnRect(arrowRight, finger^) then
+            if isOnRect(arrowRight.active, finger^) then
             begin
                 rightKey:= true;
                 walkingRight:= true;
                 exit;
             end;
-            if isOnRect(arrowUp, finger^) then
+            if isOnRect(arrowUp.active, finger^) then
             begin
                 upKey:= true;
                 aimingUp:= true;
                 exit;
             end;
-            if isOnRect(arrowDown, finger^) then
+            if isOnRect(arrowDown.active, finger^) then
             begin
                 downKey:= true;
                 aimingDown:= true;
                 exit;
             end;
 
-            if isOnRect(backjump, finger^) then
+            if isOnRect(backjump.active, finger^) then
             begin
                 enterKey:= true;
                 exit;
             end;
-            if isOnRect(forwardjump, finger^) then
+            if isOnRect(forwardjump.active, finger^) then
             begin
                 backspaceKey:= true;
                 exit;
             end;
-            if isOnRect(pauseButton, finger^) then
+            if isOnRect(pauseButton.active, finger^) then
             begin
                 isPaused:= not isPaused;
                 exit;
@@ -543,24 +542,10 @@
 end;
 
 function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean;
-var widget: TOnScreenWidget;
-begin
-    widget.x:= rect.x;
-    widget.y:= rect.y;
-    widget.width:= rect.w;
-    widget.height:= rect.h;
-    widget.hOffset:= 0;
-    widget.vOffset:= 0;
-    exit(isOnRect(widget, finger));
-end;
-
-function isOnRect(widget: TOnScreenWidget; finger: TTouch_Data): boolean;
-begin
-with widget do
-    isOnRect:= (finger.x > x + hOffset)   and
-               (finger.x < x + width + hOffset) and
-               (cScreenHeight - finger.y > y + vOffset)   and
-               (cScreenHeight - finger.y < y + height + vOffset);
+    isOnRect:= (finger.x > rect.x)   and
+               (finger.x < rect.x + rect.w) and
+               (cScreenHeight - finger.y > rect.y) and
+               (cScreenHeight - finger.y < rect.y + rect.h);
 end;
 
 procedure printFinger(finger: TTouch_Data);