remove many unneeded ifdefs from uTouch
authorkoda
Sat, 27 Jul 2013 04:20:49 +0200
changeset 9380 563ab624522c
parent 9379 1bcfcaf0926e
child 9381 90f9d8046a86
child 9382 f1464fa10c0b
remove many unneeded ifdefs from uTouch
hedgewars/uTouch.pas
--- a/hedgewars/uTouch.pas	Sat Jul 27 04:19:14 2013 +0200
+++ b/hedgewars/uTouch.pas	Sat Jul 27 04:20:49 2013 +0200
@@ -93,7 +93,6 @@
     finger: PTouch_Data;
     xr, yr: LongWord;
 begin
-{$IFDEF USE_TOUCH_INTERFACE}
 xr:= round(x * cScreenWidth);
 yr:= round(y * cScreenHeight);
 
@@ -181,7 +180,6 @@
             end;
         end;
     end;
-{$ENDIF}
 end;
 
 procedure onTouchMotion(x, y, dx, dy: Single; pointerId: TSDL_FingerId);
@@ -240,7 +238,6 @@
     widget: POnScreenWidget;
     xr, yr: LongWord;
 begin
-{$IFDEF USE_TOUCH_INTERFACE}
 xr:= round(x * cScreenWidth);
 yr:= round(y * cScreenHeight);
 
@@ -301,7 +298,6 @@
     AddCaption('Press the target button to mark the target', cWhiteColor, capgrpAmmoInfo);
 
 deleteFinger(pointerId);
-{$ENDIF}
 end;
 
 procedure onTouchDoubleClick(finger: TTouch_Data);
@@ -311,14 +307,11 @@
 
 procedure onTouchLongClick(finger: TTouch_Data);
 begin
-{$IFDEF USE_TOUCH_INTERFACE}
 if isOnWidget(jumpWidget, finger) then
     begin
     ParseTeamCommand('ljump');
     exit;
     end;
-
-{$ENDIF}
 end;
 
 procedure onTouchClick(finger: TTouch_Data);
@@ -347,7 +340,6 @@
     exit;
     end;
 
-{$IFDEF USE_TOUCH_INTERFACE}
 if isOnCurrentHog(finger) or isOnWidget(AMWidget, finger) then
     begin
     bShowAmmoMenu := true;
@@ -359,7 +351,6 @@
     ParseTeamCommand('hjump');
     exit;
     end;
-{$ENDIF}
 end;
 
 function addFinger(x,y: Longword; id: TSDL_FingerId): PTouch_Data;