X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Flibgame%2Fsystem.c;h=2b283c1a0c5d6813b7b533d30a1c10b1c66f21d6;hb=d870b82d2c53def1ed6da9fdc46ce6bf3dd1bfae;hp=de59d77a6ce4bf501d8d278fa43f12c29216c617;hpb=cad3c0cde6926a8a379725b1ffc6fc657272a76d;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index de59d77a..2b283c1a 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -300,7 +300,18 @@ void InitGfxOtherSettings()
 
 void InitOverlayInfo()
 {
+  overlay.enabled = FALSE;
   overlay.active = FALSE;
+
+#if defined(PLATFORM_ANDROID)
+  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+    overlay.enabled = TRUE;
+#endif
+}
+
+void SetOverlayEnabled(boolean enabled)
+{
+  overlay.enabled = enabled;
 }
 
 void SetOverlayActive(boolean active)
@@ -1620,7 +1631,7 @@ void InitJoysticks()
   /* always start with reliable default values */
   joystick.status = JOYSTICK_NOT_AVAILABLE;
   for (i = 0; i < MAX_PLAYERS; i++)
-    joystick.fd[i] = -1;		/* joystick device closed */
+    joystick.nr[i] = -1;		/* no joystick configured */
 
   SDLInitJoysticks();
 }