Added docking clearance joystick button control to stickmapper.

OoliteProject · Jan 1, 2019 · 32c8b48 · 32c8b48
1 parent 036c0ee
commit 32c8b48
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/Resources/Config/descriptions.plist b/Resources/Config/descriptions.plist
@@ -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";

diff --git a/src/Core/Entities/PlayerEntityControls.m b/src/Core/Entities/PlayerEntityControls.m
@@ -1321,7 +1321,7 @@ - (void) pollFlightControls:(double)delta_t
 
 				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)
 					{

diff --git a/src/Core/Entities/PlayerEntityStickMapper.m b/src/Core/Entities/PlayerEntityStickMapper.m
@@ -675,6 +675,11 @@ - (NSArray *)stickFunctionList
 				  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;
 }
 

diff --git a/src/Core/OOJoystickManager.h b/src/Core/OOJoystickManager.h
@@ -98,6 +98,7 @@ enum {
 	BUTTON_INC_FIELD_OF_VIEW,
 	BUTTON_DEC_FIELD_OF_VIEW,
 #endif
+	BUTTON_DOCKINGCLEARANCE,
 	BUTTON_end
 };