fixed ignoring clicks on global animations after executing event actions

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 3c1faa3342070d8dc9fc22435deeb3bd833a3b74..ac75c2afc8151a97e03cd7428bb08ab5265c8b59 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8305,12 +8305,15 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_TOUCH_CONTROL_TYPE         41
 #define SETUP_TOKEN_TOUCH_MOVE_DISTANCE                42
 #define SETUP_TOKEN_TOUCH_DROP_DISTANCE                43
-#define SETUP_TOKEN_TOUCH_GRID_XSIZE_0         44
-#define SETUP_TOKEN_TOUCH_GRID_YSIZE_0         45
-#define SETUP_TOKEN_TOUCH_GRID_XSIZE_1         46
-#define SETUP_TOKEN_TOUCH_GRID_YSIZE_1         47
+#define SETUP_TOKEN_TOUCH_TRANSPARENCY         44
+#define SETUP_TOKEN_TOUCH_DRAW_OUTLINED                45
+#define SETUP_TOKEN_TOUCH_DRAW_PRESSED         46
+#define SETUP_TOKEN_TOUCH_GRID_XSIZE_0         47
+#define SETUP_TOKEN_TOUCH_GRID_YSIZE_0         48
+#define SETUP_TOKEN_TOUCH_GRID_XSIZE_1         49
+#define SETUP_TOKEN_TOUCH_GRID_YSIZE_1         50
 
-#define NUM_GLOBAL_SETUP_TOKENS                        48
+#define NUM_GLOBAL_SETUP_TOKENS                        51
 
 /* auto setup */
 #define SETUP_TOKEN_AUTO_EDITOR_ZOOM_TILESIZE  0
@@ -8511,6 +8514,9 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_STRING, &si.touch.control_type,      "touch.control_type"     },
   { TYPE_INTEGER,&si.touch.move_distance,     "touch.move_distance"    },
   { TYPE_INTEGER,&si.touch.drop_distance,     "touch.drop_distance"    },
+  { TYPE_INTEGER,&si.touch.transparency,      "touch.transparency"     },
+  { TYPE_INTEGER,&si.touch.draw_outlined,     "touch.draw_outlined"    },
+  { TYPE_INTEGER,&si.touch.draw_pressed,      "touch.draw_pressed"     },
   { TYPE_INTEGER,&si.touch.grid_xsize[0],     "touch.virtual_buttons.0.xsize" },
   { TYPE_INTEGER,&si.touch.grid_ysize[0],     "touch.virtual_buttons.0.ysize" },
   { TYPE_INTEGER,&si.touch.grid_xsize[1],     "touch.virtual_buttons.1.xsize" },
@@ -8728,6 +8734,9 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT);
   si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT;       /* percent */
   si->touch.drop_distance = TOUCH_DROP_DISTANCE_DEFAULT;       /* percent */
+  si->touch.transparency = TOUCH_TRANSPARENCY_DEFAULT;         /* percent */
+  si->touch.draw_outlined = TRUE;
+  si->touch.draw_pressed = TRUE;
 
   for (i = 0; i < 2; i++)
   {