equal
deleted
inserted
replaced
225 case 7: |
225 case 7: |
226 HW_tab(); |
226 HW_tab(); |
227 break; |
227 break; |
228 case 10: |
228 case 10: |
229 [self showPopover]; |
229 [self showPopover]; |
|
230 break; |
|
231 case 11: |
|
232 HW_ammoMenu(); |
230 break; |
233 break; |
231 default: |
234 default: |
232 NSLog(@"Nope"); |
235 NSLog(@"Nope"); |
233 break; |
236 break; |
234 } |
237 } |
325 if (currentPosition.y < screen.size.width - 120) { |
328 if (currentPosition.y < screen.size.width - 120) { |
326 switch ([touches count]) { |
329 switch ([touches count]) { |
327 case 1: |
330 case 1: |
328 DLog(@"X:%d Y:%d", HWX(currentPosition.x), HWY(currentPosition.y)); |
331 DLog(@"X:%d Y:%d", HWX(currentPosition.x), HWY(currentPosition.y)); |
329 HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
332 HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); |
|
333 if (2 == [touch tapCount]) |
|
334 HW_zoomReset(); |
330 break; |
335 break; |
331 case 2: |
336 case 2: |
332 if (2 == [touch tapCount]) { |
|
333 HW_ammoMenu(); |
|
334 //HW_zoomReset(); |
|
335 } |
|
336 |
|
337 // pinching |
337 // pinching |
338 twoTouches = [touches allObjects]; |
338 twoTouches = [touches allObjects]; |
339 UITouch *first = [twoTouches objectAtIndex:0]; |
339 UITouch *first = [twoTouches objectAtIndex:0]; |
340 UITouch *second = [twoTouches objectAtIndex:1]; |
340 UITouch *second = [twoTouches objectAtIndex:1]; |
341 initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |
341 initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]); |