pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compiler warnings. "leftFingerDown" doesn't need to be an SDL_FingerID.

Browse source
This commit is contained in:
Ryan C. Gordon 2013-04-03 11:34:21 -04:00
parent 6bcac2ad67
commit 7ffbc59786
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video/uikit/SDL_uikitview.h
View file

@ -37,7 +37,7 @@
#endif #endif
SDL_TouchID touchId; SDL_TouchID touchId;
SDL_FingerID leftFingerDown; UITouch *leftFingerDown;
#ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
UITouch *finger[MAX_SIMULTANEOUS_TOUCHES]; UITouch *finger[MAX_SIMULTANEOUS_TOUCHES];
#endif #endif

10
src/video/uikit/SDL_uikitview.m
View file

@ -94,7 +94,7 @@
/* send mouse down event */ /* send mouse down event */
SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT); SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
leftFingerDown = (SDL_FingerID)touch; leftFingerDown = touch;
} }
CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES]; CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
@ -102,7 +102,7 @@
// FIXME: TODO: Using touch as the fingerId is potentially dangerous // FIXME: TODO: Using touch as the fingerId is potentially dangerous
// It is also much more efficient than storing the UITouch pointer // It is also much more efficient than storing the UITouch pointer
// and comparing it to the incoming event. // and comparing it to the incoming event.
SDL_SendTouch(touchId, (SDL_FingerID)touch, SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch),
SDL_TRUE, locationInView.x, locationInView.y, 1.0f); SDL_TRUE, locationInView.x, locationInView.y, 1.0f);
#else #else
int i; int i;
@ -125,10 +125,10 @@
UITouch *touch = (UITouch*)[enumerator nextObject]; UITouch *touch = (UITouch*)[enumerator nextObject];
while(touch) { while(touch) {
if ((SDL_FingerID)touch == leftFingerDown) { if (touch == leftFingerDown) {
/* send mouse up */ /* send mouse up */
SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT); SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
leftFingerDown = 0; leftFingerDown = nil;
} }
CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES]; CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
@ -166,7 +166,7 @@
UITouch *touch = (UITouch*)[enumerator nextObject]; UITouch *touch = (UITouch*)[enumerator nextObject];
while (touch) { while (touch) {
if ((SDL_FingerID)touch == leftFingerDown) { if (touch == leftFingerDown) {
CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO]; CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
/* send moved event */ /* send moved event */