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

Added docking clearance joystick button control to stickmapper.

Browse Source
This commit is contained in:
AnotherCommander 2019-01-01 20:07:33 +01:00
parent 036c0ee1d9
commit 32c8b485db
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Config/descriptions.plist
View File

@ -1659,6 +1659,7 @@
"stickmapper-dockcpu" = "Autopilot (standard)";
"stickmapper-dockcpufast" = "Autopilot (fast)";
"stickmapper-compass-mode-next" = "Next compass target";
"stickmapper-docking-clearance" = "Docking clearance";
"oolite-stickprofile-title" = "Joystick Profile";
"oolite-stickprofile-back" = "Back";

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

@ -1321,7 +1321,7 @@ static NSTimeInterval time_last_frame;
exceptionContext = @"docking clearance request";
if ([gameView isDown:key_docking_clearance_request])
if ([gameView isDown:key_docking_clearance_request] || joyButtonState[BUTTON_DOCKINGCLEARANCE])
{
if (!docking_clearance_request_key_pressed)
{

5
src/Core/Entities/PlayerEntityStickMapper.m
View File

@ -675,6 +675,11 @@ MA 02110-1301, USA.
allowable:HW_BUTTON
axisfn:STICK_NOFUNCTION
butfn:BUTTON_COMPASSMODE]];
[funcList addObject:
[self makeStickGuiDict:DESC(@"stickmapper-docking-clearance")
allowable:HW_BUTTON
axisfn:STICK_NOFUNCTION
butfn:BUTTON_DOCKINGCLEARANCE]];
return funcList;
}

1
src/Core/OOJoystickManager.h
View File

@ -98,6 +98,7 @@ enum {
BUTTON_INC_FIELD_OF_VIEW,
BUTTON_DEC_FIELD_OF_VIEW,
#endif
BUTTON_DOCKINGCLEARANCE,
BUTTON_end
};