From: Holger Schemel <info@artsoft.org>
Date: Mon, 22 Sep 2014 21:03:39 +0000 (+0200)
Subject: removed checking of file identifier tokens for config files
X-Git-Tag: 4.0.0.0-rc1~347
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=4bab1dda973bbcc46ca5ca9e2792b3bceb6694b9;p=rocksndiamonds.git

removed checking of file identifier tokens for config files
---

diff --git a/ChangeLog b/ChangeLog
index 805bda13..644cdaa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-09-22
+	* removed checking of file identifier tokens for configuration files
+
 2014-09-19
 	* fixed bug where player actions were only mapped in team mode
 	  (this broke four tapes in automatic game engine unit test where
diff --git a/src/conftime.h b/src/conftime.h
index 5b62f83d..e06a2aee 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2014-09-22 00:08"
+#define COMPILE_DATE_STRING "2014-09-22 16:51"
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index b9f9a3ae..68875eb6 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -30,7 +30,8 @@
 #include "hash.h"
 
 
-#define ENABLE_UNUSED_CODE	0	/* currently unused functions */
+#define USE_FILE_IDENTIFIERS	FALSE	/* do not use identifiers anymore */
+#define ENABLE_UNUSED_CODE	FALSE	/* for currently unused functions */
 
 #define NUM_LEVELCLASS_DESC	8
 
@@ -2103,12 +2104,14 @@ SetupFileHash *loadSetupFileHash(char *filename)
 void checkSetupFileHashIdentifier(SetupFileHash *setup_file_hash,
 				  char *filename, char *identifier)
 {
+#if USE_FILE_IDENTIFIERS
   char *value = getHashEntry(setup_file_hash, TOKEN_STR_FILE_IDENTIFIER);
 
   if (value == NULL)
     Error(ERR_WARN, "config file '%s' has no file identifier", filename);
   else if (!checkCookieString(value, identifier))
     Error(ERR_WARN, "config file '%s' has wrong file identifier", filename);
+#endif
 }