X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=16af2dd4b4d84769faffc1c981a4153040a98498;hp=f20c215596e58b88a2b4d5a1ab1020c43e1ada67;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=273ed881a8affb54ee8e2bd7489eb3d898e11c23

diff --git a/src/files.c b/src/files.c
index f20c2155..16af2dd4 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* files.c                                                  *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// files.c
+// ============================================================================
 
 #include <ctype.h>
 #include <sys/stat.h>
@@ -11365,8 +11363,11 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_VOLUME_SIMPLE		35
 #define SETUP_TOKEN_VOLUME_LOOPS		36
 #define SETUP_TOKEN_VOLUME_MUSIC		37
+#define SETUP_TOKEN_TOUCH_CONTROL_TYPE		38
+#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE		39
+#define SETUP_TOKEN_TOUCH_DROP_DISTANCE		40
 
-#define NUM_GLOBAL_SETUP_TOKENS			38
+#define NUM_GLOBAL_SETUP_TOKENS			41
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -11514,6 +11515,9 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_INTEGER,&si.volume_simple,           "volume_simple"		},
   { TYPE_INTEGER,&si.volume_loops,            "volume_loops"		},
   { TYPE_INTEGER,&si.volume_music,            "volume_music"		},
+  { 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"	},
 };
 
 static boolean not_used = FALSE;
@@ -11686,9 +11690,13 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->override_level_sounds = FALSE;
   si->override_level_music = FALSE;
 
-  si->volume_simple = 100;	/* percent */
-  si->volume_loops = 100;	/* percent */
-  si->volume_music = 100;	/* percent */
+  si->volume_simple = 100;		/* percent */
+  si->volume_loops = 100;		/* percent */
+  si->volume_music = 100;		/* percent */
+
+  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->editor.el_boulderdash		= TRUE;
   si->editor.el_emerald_mine		= TRUE;
@@ -11957,7 +11965,8 @@ void SaveSetup()
     /* just to make things nicer :) */
     if (i == SETUP_TOKEN_PLAYER_NAME + 1 ||
 	i == SETUP_TOKEN_GRAPHICS_SET ||
-	i == SETUP_TOKEN_VOLUME_SIMPLE)
+	i == SETUP_TOKEN_VOLUME_SIMPLE ||
+	i == SETUP_TOKEN_TOUCH_CONTROL_TYPE)
       fprintf(file, "\n");
 
     fprintf(file, "%s\n", getSetupLine(global_setup_tokens, "", i));