moved virtual buttons definitions to setup data structures

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 3e0f01dbaba6950025412f58e1539ed5320fb4c2..863704ef87709702d125e4d05d2752c9257e2782 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5237,6 +5237,17 @@ static void InitMixer()
   StartMixer();
 }
 
+static void InitVideoOverlay()
+{
+  // if virtual buttons are not loaded from setup file, repeat initializing
+  // virtual buttons grid with default values now that video is initialized
+  if (!setup.touch.grid_initialized)
+    InitSetup();
+
+  InitTileCursorInfo();
+  InitOverlayInfo();
+}
+
 void InitGfxBuffers()
 {
   static int win_xsize_last = -1;
@@ -6013,9 +6024,7 @@ void OpenAll()
   InitVideoDefaults();
   InitVideoDisplay();
   InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
-
-  InitTileCursorInfo();
-  InitOverlayInfo();
+  InitVideoOverlay();
 
   print_timestamp_time("[init video stuff]");