added checking for missing INFO chunk when loading tape by filename only

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 1ff0a4d5d2aad6497a197dca087460d5f610dda4..61ea14cb7e7cdf1a76cce5382ce68d12af89a12c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -7763,6 +7763,7 @@ static void setTapeInfoToDefaults(void)
   tape.scr_fieldx = SCR_FIELDX_DEFAULT;
   tape.scr_fieldy = SCR_FIELDY_DEFAULT;
 
+  tape.no_info_chunk = TRUE;
   tape.no_valid_file = FALSE;
 }
 
@@ -7867,6 +7868,8 @@ static int LoadTape_INFO(File *file, int chunk_size, struct TapeInfo *tape)
   int level_identifier_size;
   int i;
 
+  tape->no_info_chunk = FALSE;
+
   level_identifier_size = getFile16BitBE(file);
 
   level_identifier = checked_malloc(level_identifier_size);
@@ -9358,6 +9361,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           "{\n"
           "%s"
           "  \"game_version\":         \"%s\",\n"
+          "  \"batch_time\":           \"%d\",\n"
           "  \"levelset_identifier\":  \"%s\",\n"
           "  \"levelset_name\":        \"%s\",\n"
           "  \"levelset_author\":      \"%s\",\n"
@@ -9376,6 +9380,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           "}\n",
           getPasswordJSON(setup.api_server_password),
           getProgramRealVersionString(),
+          (int)global.autoplay_time,
           levelset_identifier,
           levelset_name,
           levelset_author,
@@ -9758,23 +9763,23 @@ static struct TokenInfo global_setup_tokens[] =
   },
   {
     TYPE_SWITCH,
-    &setup.use_api_server,                     "use_api_server"
+    &setup.use_api_server,          TEST_PREFIX        "use_api_server"
   },
   {
     TYPE_STRING,
-    &setup.api_server_hostname,                        "api_server_hostname"
+    &setup.api_server_hostname,     TEST_PREFIX        "api_server_hostname"
   },
   {
     TYPE_STRING,
-    &setup.api_server_password,                        "api_server_password"
+    &setup.api_server_password,     TEST_PREFIX        "api_server_password"
   },
   {
     TYPE_SWITCH,
-    &setup.ask_for_uploading_tapes,            "ask_for_uploading_tapes"
+    &setup.ask_for_uploading_tapes, TEST_PREFIX        "ask_for_uploading_tapes"
   },
   {
     TYPE_SWITCH,
-    &setup.provide_uploading_tapes,            "provide_uploading_tapes"
+    &setup.provide_uploading_tapes, TEST_PREFIX        "provide_uploading_tapes"
   },
   {
     TYPE_STRING,