X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=21a5945bc92b0519016e7029547ca96f8d5187d2;hb=329e47f3131d6d3cad97adff27db207c906f5f20;hp=7403be0f042dd7af216ed8c226cff5c919713be3;hpb=aeffe316860a47217d9b5074ade03cebda8730c9;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 7403be0f..21a5945b 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -581,6 +581,8 @@ void TapeErase(void)
   tape.game_version = GAME_VERSION_ACTUAL;
   tape.engine_version = level.game_version;
 
+  tape.property_bits = TAPE_PROPERTY_NONE;
+
   TapeSetDateFromNow();
 
   for (i = 0; i < MAX_PLAYERS; i++)
@@ -672,6 +674,8 @@ static void TapeAppendRecording(void)
   // set current delay (for last played move)
   tape.pos[tape.counter].delay = tape.delay_played;
 
+  tape.property_bits |= TAPE_PROPERTY_REPLAYED;
+
   // set current date
   TapeSetDateFromNow();
 
@@ -762,6 +766,12 @@ void TapeRecordAction(byte action_raw[MAX_TAPE_ACTIONS])
     tape.set_centered_player = FALSE;
   }
 
+  if (GameFrameDelay != GAME_FRAME_DELAY)
+    tape.property_bits |= TAPE_PROPERTY_GAME_SPEED;
+
+  if (setup.small_game_graphics || SCR_FIELDX >= 2 * SCR_FIELDX_DEFAULT)
+    tape.property_bits |= TAPE_PROPERTY_SMALL_GRAPHICS;
+
   if (!TapeAddAction(action))
     TapeStopRecording();
 }
@@ -783,6 +793,12 @@ void TapeTogglePause(boolean toggle_mode)
   if (tape.single_step && (toggle_mode & TAPE_TOGGLE_MANUAL))
     tape.single_step = FALSE;
 
+  if (tape.single_step)
+    tape.property_bits |= TAPE_PROPERTY_SINGLE_STEP;
+
+  if (tape.pausing)
+    tape.property_bits |= TAPE_PROPERTY_PAUSE_MODE;
+
   DrawVideoDisplayCurrentState();
 
   if (tape.deactivate_display)
@@ -812,12 +828,14 @@ void TapeTogglePause(boolean toggle_mode)
 
   if (game_status == GAME_MODE_PLAYING)
   {
-    if (setup.show_snapshot_buttons && CheckEngineSnapshotList())
+    if (setup.show_load_save_buttons &&
+	setup.show_undo_redo_buttons &&
+	CheckEngineSnapshotList())
     {
       if (tape.pausing)
 	MapUndoRedoButtons();
       else if (!tape.single_step)
-	UnmapUndoRedoButtons();
+	MapLoadSaveButtons();
     }
 
     ModifyPauseButtons();
@@ -1068,6 +1086,8 @@ void TapeQuickSave(void)
     return;
   }
 
+  tape.property_bits |= TAPE_PROPERTY_SNAPSHOT;
+
   if (SaveTapeChecked(tape.level_nr))
     SaveEngineSnapshotSingle();
 }
@@ -1126,6 +1146,7 @@ void TapeQuickLoad(void)
     TapeStartWarpForward(AUTOPLAY_MODE_WARP_NO_DISPLAY);
 
     tape.quick_resume = TRUE;
+    tape.property_bits |= TAPE_PROPERTY_SNAPSHOT;
   }
   else	// this should not happen (basically checked above)
   {
@@ -1250,6 +1271,52 @@ void FixTape_ForceSinglePlayer(void)
 // tape autoplay functions
 // ----------------------------------------------------------------------------
 
+static void AutoPlayTapes_SetScoreEntry(int score, int time)
+{
+  // set unique basename for score tape (for uploading to score server)
+  strcpy(tape.score_tape_basename, getScoreTapeBasename(setup.player_name));
+
+  // store score in first score entry
+  scores.last_added = 0;
+
+  struct ScoreEntry *entry = &scores.entry[scores.last_added];
+
+  strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
+  strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN);
+
+  entry->score = score;
+  entry->time = time;
+
+  PrintNoLog("- uploading score tape to score server ... ");
+
+  server_scores.uploaded = FALSE;
+}
+
+static void AutoPlayTapes_WaitForUpload(void)
+{
+  unsigned int upload_delay = 0;
+  unsigned int upload_delay_value = 10000;
+
+  ResetDelayCounter(&upload_delay);
+
+  // wait for score tape to be successfully uploaded (and fail on timeout)
+  while (!server_scores.uploaded)
+  {
+    if (DelayReached(&upload_delay, upload_delay_value))
+    {
+      PrintNoLog("\r");
+      Print("- uploading score tape to score server - TIMEOUT.\n");
+
+      Fail("cannot upload score tape to score server");
+    }
+
+    Delay(20);
+  }
+
+  PrintNoLog("\r");
+  Print("- uploading score tape to score server - uploaded.\n");
+}
+
 void AutoPlayTapes(void)
 {
   static LevelDirTree *autoplay_leveldir = NULL;
@@ -1344,19 +1411,7 @@ void AutoPlayTapes(void)
     if (global.autoplay_mode == AUTOPLAY_MODE_SAVE &&
 	tape.auto_play_level_solved)
     {
-      // set unique basename for score tape (for uploading to score server)
-      strcpy(tape.score_tape_basename, getScoreTapeBasename(setup.player_name));
-
-      // store score in first score entry
-      scores.last_added = 0;
-
-      struct ScoreEntry *entry = &scores.entry[scores.last_added];
-
-      strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
-      strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN);
-
-      entry->score = game.score_final;
-      entry->time = game.score_time_final;
+      AutoPlayTapes_SetScoreEntry(game.score_final, game.score_time_final);
 
       if (leveldir_current)
       {
@@ -1369,10 +1424,6 @@ void AutoPlayTapes(void)
 	tape.level_nr = level_nr;
       }
 
-      PrintNoLog("- uploading score tape to score server ... ");
-
-      server_scores.uploaded = FALSE;
-
       // save score tape to upload to server; may be required for some reasons:
       // * level set identifier in solution tapes may differ from level set
       // * solution tape may have native format (like Supaplex solution files)
@@ -1380,27 +1431,7 @@ void AutoPlayTapes(void)
       SaveScoreTape(level_nr);
       SaveServerScore(level_nr);
 
-      unsigned int upload_delay = 0;
-      unsigned int upload_delay_value = 10000;
-
-      ResetDelayCounter(&upload_delay);
-
-      // wait for score tape to be successfully uploaded (and fail on timeout)
-      while (!server_scores.uploaded)
-      {
-	if (DelayReached(&upload_delay, upload_delay_value))
-	{
-	  PrintNoLog("\r");
-	  Print("- uploading score tape to score server - TIMEOUT.\n");
-
-	  Fail("cannot upload score tape to score server");
-	}
-
-	Delay(20);
-      }
-
-      PrintNoLog("\r");
-      Print("- uploading score tape to score server - uploaded.\n");
+      AutoPlayTapes_WaitForUpload();
     }
 
     if (patch_nr == 0)
@@ -1414,6 +1445,14 @@ void AutoPlayTapes(void)
   }
   else
   {
+    if ((global.autoplay_mode == AUTOPLAY_MODE_SAVE ||
+	 global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) &&
+	!options.mytapes &&
+	options.player_name == NULL)
+    {
+      Fail("specify player name when uploading solution tapes");
+    }
+
     DrawCompleteVideoDisplay();
 
     audio.sound_enabled = FALSE;
@@ -1590,55 +1629,37 @@ void AutoPlayTapes(void)
 
     if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
     {
-      // set unique basename for score tape (for uploading to score server)
-      strcpy(tape.score_tape_basename, getScoreTapeBasename(setup.player_name));
-
-      // store score in first score entry
-      scores.last_added = 0;
-
-      struct ScoreEntry *entry = &scores.entry[scores.last_added];
-
-      strncpy(entry->tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
-      strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN);
-
-      entry->score = 0;
-      entry->time = 0;
+      boolean use_temporary_tape_file = FALSE;
 
       Print("Tape %03d:\n", level_nr);
-      PrintNoLog("- uploading score tape to score server ... ");
 
-      server_scores.uploaded = FALSE;
+      AutoPlayTapes_SetScoreEntry(0, 0);
 
       if (tape_filename == NULL)
+      {
 	tape_filename = (options.mytapes ? getTapeFilename(level_nr) :
-			 getSolutionTapeFilename(level_nr));
-
-      SaveServerScoreFromFile(level_nr, tape_filename);
+			 getDefaultSolutionTapeFilename(level_nr));
 
-      // required for uploading multiple tapes
-      tape_filename = NULL;
+	if (!fileExists(tape_filename))
+	{
+	  // non-standard solution tape -- save to temporary file
+	  tape_filename = getTemporaryTapeFilename();
 
-      unsigned int upload_delay = 0;
-      unsigned int upload_delay_value = 10000;
+	  SaveTapeToFilename(tape_filename);
 
-      ResetDelayCounter(&upload_delay);
+	  use_temporary_tape_file = TRUE;
+	}
+      }
 
-      // wait for score tape to be successfully uploaded (and fail on timeout)
-      while (!server_scores.uploaded)
-      {
-	if (DelayReached(&upload_delay, upload_delay_value))
-	{
-	  PrintNoLog("\r");
-	  Print("- uploading score tape to score server - TIMEOUT.\n");
+      SaveServerScoreFromFile(level_nr, tape_filename);
 
-	  Fail("cannot upload score tape to score server");
-	}
+      AutoPlayTapes_WaitForUpload();
 
-	Delay(20);
-      }
+      if (use_temporary_tape_file)
+        unlink(tape_filename);
 
-      PrintNoLog("\r");
-      Print("- uploading score tape to score server - uploaded.\n");
+      // required for uploading multiple tapes
+      tape_filename = NULL;
 
       continue;
     }