X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=de23a94035ee2ef5da704d97a06e53ec43f21b8a;hb=2fab4d4c183c2ac47cef52a09b45ed6a83ad31cb;hp=bbfbe9c3d9063057f2d044e94e2401111705a550;hpb=33775032e403b28c89ee7c60b64a456d30a013fb;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index bbfbe9c3..de23a940 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -31,6 +31,7 @@
 
 
 #define ENABLE_UNUSED_CODE	FALSE	/* for currently unused functions */
+#define DEBUG_NO_CONFIG_FILE	FALSE	/* for extra-verbose debug output */
 
 #define NUM_LEVELCLASS_DESC	8
 
@@ -1575,7 +1576,7 @@ char *getCookie(char *file_type)
 
   sprintf(cookie, "%s_%s_FILE_VERSION_%d.%d",
 	  program.cookie_prefix, file_type,
-	  program.version_major, program.version_minor);
+	  program.version_super, program.version_major);
 
   return cookie;
 }
@@ -1600,7 +1601,7 @@ int getFileVersionFromCookieString(const char *cookie)
   const int len_pattern1 = strlen(pattern1);
   const int len_pattern2 = strlen(pattern2);
   const int len_pattern = len_pattern1 + len_pattern2;
-  int version_major, version_minor;
+  int version_super, version_major;
 
   if (len_cookie <= len_pattern)
     return -1;
@@ -1616,10 +1617,10 @@ int getFileVersionFromCookieString(const char *cookie)
       ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9')
     return -1;
 
-  version_major = ptr_cookie2[0] - '0';
-  version_minor = ptr_cookie2[2] - '0';
+  version_super = ptr_cookie2[0] - '0';
+  version_major = ptr_cookie2[2] - '0';
 
-  return VERSION_IDENT(version_major, version_minor, 0, 0);
+  return VERSION_IDENT(version_super, version_major, 0, 0);
 }
 
 boolean checkCookieString(const char *cookie, const char *template)
@@ -2024,7 +2025,9 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename,
 
   if (!(file = openFile(filename, MODE_READ)))
   {
+#if DEBUG_NO_CONFIG_FILE
     Error(ERR_DEBUG, "cannot open configuration file '%s'", filename);
+#endif
 
     return FALSE;
   }
@@ -2629,6 +2632,10 @@ void setSetupInfo(struct TokenInfo *token_info,
       *(char **)setup_value = getStringCopy(token_value);
       break;
 
+    case TYPE_PLAYER:
+      *(int *)setup_value = get_player_nr_from_string(token_value);
+      break;
+
     default:
       break;
   }
@@ -2962,7 +2969,9 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
 
   if (setup_file_hash == NULL)
   {
+#if DEBUG_NO_CONFIG_FILE
     Error(ERR_WARN, "ignoring level directory '%s'", directory_path);
+#endif
 
     free(directory_path);
     free(filename);
@@ -3200,8 +3209,10 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first,
 
     if (!valid_file_found)
     {
+#if DEBUG_NO_CONFIG_FILE
       if (!strEqual(directory_name, "."))
 	Error(ERR_WARN, "ignoring artwork directory '%s'", directory_path);
+#endif
 
       free(directory_path);
       free(filename);
@@ -3872,6 +3883,10 @@ char *getSetupValue(int type, void *value)
       strcpy(value_string, *(char **)value);
       break;
 
+    case TYPE_PLAYER:
+      sprintf(value_string, "player_%d", *(int *)value + 1);
+      break;
+
     default:
       value_string[0] = '\0';
       break;