Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mouse wheel can now be used to control speed when mouse control is on.

Browse Source
This commit is contained in:
AnotherCommander 2017-07-22 14:57:05 +02:00
parent e7bc4e71e4
commit 13a0467872
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Entities/PlayerEntityControls.m
View File

@ -912,13 +912,19 @@ static NSTimeInterval time_last_frame;
// DJS: Thrust can be an axis or a button. Axis takes precidence.
double reqSpeed=[stickHandler getAxisState: AXIS_THRUST];
// Updated DJS original code to fix BUG #17482 - (Getafix 2010/09/13)
if (([gameView isDown:key_increase_speed] || joyButtonState[BUTTON_INCTHRUST])&&(flightSpeed < maxFlightSpeed)&&(!afterburner_engaged))
if (([gameView isDown:key_increase_speed] ||
joyButtonState[BUTTON_INCTHRUST] ||
((mouse_control_on)&&([gameView mouseWheelState] == gvMouseWheelUp) && !([UNIVERSE viewDirection] && [gameView isCapsLockOn])))
&& (flightSpeed < maxFlightSpeed) && (!afterburner_engaged))
{
flightSpeed += speed_delta * delta_t;
}
// ** tgape ** - decrease obviously means no hyperspeed
if (([gameView isDown:key_decrease_speed] || joyButtonState[BUTTON_DECTHRUST])&&(!afterburner_engaged))
if (([gameView isDown:key_decrease_speed] ||
joyButtonState[BUTTON_DECTHRUST] ||
((mouse_control_on)&&([gameView mouseWheelState] == gvMouseWheelDown) && !([UNIVERSE viewDirection] && [gameView isCapsLockOn])))
&& (!afterburner_engaged))
{
flightSpeed -= speed_delta * delta_t;