equal
deleted
inserted
replaced
101 begin |
101 begin |
102 finger := addFinger(x,y,pointerId); |
102 finger := addFinger(x,y,pointerId); |
103 case pointerCount of |
103 case pointerCount of |
104 1: |
104 1: |
105 begin |
105 begin |
106 moveCursor:= false; |
106 moveCursor:= not bShowAmmoMenu; |
107 if bShowAmmoMenu then |
|
108 begin |
|
109 moveCursor := true; |
|
110 exit; |
|
111 end; |
|
112 |
107 |
113 if isOnCrosshair(finger^) then |
108 if isOnCrosshair(finger^) then |
114 begin |
109 begin |
115 aiming:= true; |
110 aiming:= true; |
116 exit; |
111 exit; |
155 if isOnRect(forwardjumpX, forwardjumpY, forwardjumpW, forwardjumpH, finger^) then |
150 if isOnRect(forwardjumpX, forwardjumpY, forwardjumpW, forwardjumpH, finger^) then |
156 begin |
151 begin |
157 ParseCommand('ljump', true); |
152 ParseCommand('ljump', true); |
158 exit; |
153 exit; |
159 end; |
154 end; |
160 |
|
161 |
|
162 moveCursor:= true; |
|
163 end; |
155 end; |
164 2: |
156 2: |
165 begin |
157 begin |
166 aiming:= false; |
158 aiming:= false; |
167 stopFiring:= true; |
159 stopFiring:= true; |
270 |
262 |
271 xTouchClick:= finger.x; |
263 xTouchClick:= finger.x; |
272 yTouchClick:= finger.y; |
264 yTouchClick:= finger.y; |
273 timeSinceClick:= SDL_GetTicks; |
265 timeSinceClick:= SDL_GetTicks; |
274 |
266 |
275 if bShowAmmoMenu then |
267 if bShowAmmoMenu then |
276 begin |
268 begin |
277 CursorPoint.X:= finger.x; |
269 if isOnRect(AmmoRect.x, AmmoRect.y, AmmoRect.w, AmmoRect.h, finger) then |
278 CursorPoint.Y:= finger.y; |
270 begin |
279 doPut(CursorPoint.X, CursorPoint.Y, false); |
271 CursorPoint.X:= finger.x; |
280 exit |
272 CursorPoint.Y:= finger.y; |
281 end; |
273 doPut(CursorPoint.X, CursorPoint.Y, false); |
|
274 end |
|
275 else |
|
276 bShowAmmoMenu:= false; |
|
277 exit; |
|
278 end; |
|
279 |
282 |
280 |
283 if isOnCurrentHog(finger) then |
281 if isOnCurrentHog(finger) then |
284 begin |
282 begin |
285 bShowAmmoMenu := true; |
283 bShowAmmoMenu := true; |
286 exit; |
284 exit; |