TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove redundant store in kconfig_read_controls

Browse source 
Adjust the value as a local, then write it back when finished.
This commit is contained in:
Kp 2016-10-28 03:39:40 +00:00
parent 7e936df9c8
commit 902e242194
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
similar/main/kconfig.cpp
View file

@ -1725,9 +1725,7 @@ void kconfig_read_controls(const d_event &event, int automap_flag)
break;
const auto &av = event_joystick_get_axis(event);
const auto &axis = av.axis;
const auto &value = av.value;
Controls.raw_joy_axis[axis] = value;
auto value = av.value;
if (axis == kcm_joystick[13].value) // Pitch U/D Deadzone
joy_null_value = PlayerCfg.JoystickDead[1]*8;
@ -1742,12 +1740,13 @@ void kconfig_read_controls(const d_event &event, int automap_flag)
else if (axis == kcm_joystick[23].value) // Throttle - default deadzone
joy_null_value = PlayerCfg.JoystickDead[5]*3;
if (Controls.raw_joy_axis[axis] > joy_null_value)
Controls.raw_joy_axis[axis] = ((Controls.raw_joy_axis[axis]-joy_null_value)*128)/(128-joy_null_value);
else if (Controls.raw_joy_axis[axis] < -joy_null_value)
Controls.raw_joy_axis[axis] = ((Controls.raw_joy_axis[axis]+joy_null_value)*128)/(128-joy_null_value);
if (value > joy_null_value)
value = ((value - joy_null_value) * 128) / (128 - joy_null_value);
else if (value < -joy_null_value)
value = ((value + joy_null_value) * 128) / (128 - joy_null_value);
else
Controls.raw_joy_axis[axis] = 0;
value = 0;
Controls.raw_joy_axis[axis] = value;
break;
}
#endif