X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsystem.c;h=5888f344a81c9cbd4585fdadff54f0a27b89d1fb;hb=42bdcd19b3737eb4dd9d87f04c6af8d10895c14b;hp=29c3b24cb6f82df737a596d97b3f27d5b5024f62;hpb=38568f7dfac13f7a53f1d8751db2a63b64c935e8;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 29c3b24c..5888f344 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -29,6 +29,7 @@
 /* ========================================================================= */
 
 struct ProgramInfo	program;
+struct NetworkInfo	network;
 struct OptionInfo	options;
 struct VideoSystemInfo	video;
 struct AudioSystemInfo	audio;
@@ -103,6 +104,17 @@ void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir,
   program.headless = FALSE;
 }
 
+void InitNetworkInfo(boolean enabled, boolean connected, boolean serveronly,
+		     char *server_host, int server_port)
+{
+  network.enabled = enabled;
+  network.connected = connected;
+  network.serveronly = serveronly;
+
+  network.server_host = server_host;
+  network.server_port = server_port;
+}
+
 void InitScoresInfo()
 {
   char *global_scores_dir = getPath2(getCommonDataDir(), SCORES_DIRECTORY);
@@ -325,12 +337,25 @@ void InitTileCursorInfo()
 
 void InitOverlayInfo()
 {
+  int nr = GRID_ACTIVE_NR();
+  int x, y;
+
   overlay.enabled = FALSE;
   overlay.active = FALSE;
 
   overlay.show_grid = FALSE;
 
-#if defined(PLATFORM_ANDROID)
+  overlay.grid_xsize = setup.touch.grid_xsize[nr];
+  overlay.grid_ysize = setup.touch.grid_ysize[nr];
+
+  for (x = 0; x < MAX_GRID_XSIZE; x++)
+    for (y = 0; y < MAX_GRID_YSIZE; y++)
+      overlay.grid_button[x][y] = setup.touch.grid_button[nr][x][y];
+
+  overlay.grid_button_highlight = CHAR_GRID_BUTTON_NONE;
+  overlay.grid_button_action = JOY_NO_ACTION;
+
+#if defined(USE_TOUCH_INPUT_OVERLAY)
   if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
     overlay.enabled = TRUE;
 #endif