Commit a063b9fbfb9ec03d1ef82519580c4f1eeb3326d4
2020-11-24T07:06:31
Fixed compiler warning
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
diff --git a/src/joystick/iphoneos/SDL_mfijoystick.m b/src/joystick/iphoneos/SDL_mfijoystick.m
index 0f463ca..6d92b4c 100644
--- a/src/joystick/iphoneos/SDL_mfijoystick.m
+++ b/src/joystick/iphoneos/SDL_mfijoystick.m
@@ -1088,10 +1088,10 @@ IOS_MFIJoystickUpdate(SDL_Joystick *joystick)
@end
@implementation SDL_RumbleContext {
- SDL_RumbleMotor *low_frequency_motor;
- SDL_RumbleMotor *high_frequency_motor;
- SDL_RumbleMotor *left_trigger_motor;
- SDL_RumbleMotor *right_trigger_motor;
+ SDL_RumbleMotor *m_low_frequency_motor;
+ SDL_RumbleMotor *m_high_frequency_motor;
+ SDL_RumbleMotor *m_left_trigger_motor;
+ SDL_RumbleMotor *m_right_trigger_motor;
}
-(id) initWithLowFrequencyMotor:(SDL_RumbleMotor*)low_frequency_motor
@@ -1100,10 +1100,10 @@ IOS_MFIJoystickUpdate(SDL_Joystick *joystick)
RightTriggerMotor:(SDL_RumbleMotor*)right_trigger_motor
{
self = [super init];
- self->low_frequency_motor = low_frequency_motor;
- self->high_frequency_motor = high_frequency_motor;
- self->left_trigger_motor = left_trigger_motor;
- self->right_trigger_motor = right_trigger_motor;
+ self->m_low_frequency_motor = low_frequency_motor;
+ self->m_high_frequency_motor = high_frequency_motor;
+ self->m_left_trigger_motor = left_trigger_motor;
+ self->m_right_trigger_motor = right_trigger_motor;
return self;
}
@@ -1111,8 +1111,8 @@ IOS_MFIJoystickUpdate(SDL_Joystick *joystick)
{
int result = 0;
- result += [self->low_frequency_motor setIntensity:((float)low_frequency_rumble / 65535.0f)];
- result += [self->high_frequency_motor setIntensity:((float)high_frequency_rumble / 65535.0f)];
+ result += [self->m_low_frequency_motor setIntensity:((float)low_frequency_rumble / 65535.0f)];
+ result += [self->m_high_frequency_motor setIntensity:((float)high_frequency_rumble / 65535.0f)];
return ((result < 0) ? -1 : 0);
}
@@ -1120,9 +1120,9 @@ IOS_MFIJoystickUpdate(SDL_Joystick *joystick)
{
int result = 0;
- if (self->left_trigger_motor && self->right_trigger_motor) {
- result += [self->left_trigger_motor setIntensity:((float)left_rumble / 65535.0f)];
- result += [self->right_trigger_motor setIntensity:((float)right_rumble / 65535.0f)];
+ if (self->m_left_trigger_motor && self->m_right_trigger_motor) {
+ result += [self->m_left_trigger_motor setIntensity:((float)left_rumble / 65535.0f)];
+ result += [self->m_right_trigger_motor setIntensity:((float)right_rumble / 65535.0f)];
} else {
result = SDL_Unsupported();
}
@@ -1131,8 +1131,8 @@ IOS_MFIJoystickUpdate(SDL_Joystick *joystick)
-(void)cleanup
{
- [self->low_frequency_motor cleanup];
- [self->high_frequency_motor cleanup];
+ [self->m_low_frequency_motor cleanup];
+ [self->m_high_frequency_motor cleanup];
}
@end