tape.level_nr = level_nr;
tape.pos[tape.counter].delay = 0;
tape.changed = TRUE;
+ tape.solved = FALSE;
tape.random_seed = InitRND(level.random_seed);
// start recording
tape.recording = TRUE;
tape.changed = TRUE;
+ tape.solved = FALSE;
// set current delay (for last played move)
tape.pos[tape.counter].delay = tape.delay_played;
void TapeHaltRecording(void)
{
- tape.counter++;
+ // only advance tape counter if any input events have been recorded
+ if (tape.pos[tape.counter].delay > 0)
+ tape.counter++;
// initialize delay for next tape entry (to be able to continue recording)
if (tape.counter < MAX_TAPE_LEN)
tape.pos[tape.counter].delay++;
}
+ tape.changed = TRUE;
+
return TRUE;
}
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
+ if (setup.autorecord_after_replay)
+ TapeAppendRecording();
+
return NULL;
}
}
if (tape.counter >= tape.length) // end of tape reached
{
- if (tape.warp_forward && !tape.auto_play)
+ if (!tape.auto_play)
{
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
+ if (setup.autorecord_after_replay)
+ TapeAppendRecording();
}
else
{
void TapeQuickSave(void)
{
- if (game_status == GAME_MODE_MAIN)
+ if (game_status != GAME_MODE_PLAYING)
{
- Request("No game that can be saved!", REQ_CONFIRM);
+ Request("No game that could be saved!", REQ_CONFIRM);
return;
}
- if (game_status != GAME_MODE_PLAYING)
+ if (!tape.recording)
+ {
+ Request("No recording that could be saved!", REQ_CONFIRM);
+
return;
+ }
- if (tape.recording)
- TapeHaltRecording(); // prepare tape for saving on-the-fly
+ TapeHaltRecording(); // prepare tape for saving on-the-fly
if (TAPE_IS_EMPTY(tape))
{
- Request("No tape that can be saved!", REQ_CONFIRM);
+ Request("No tape that could be saved!", REQ_CONFIRM);
return;
}
return TRUE;
}
-static void PlayScoreTape_UpdateBusyState(void)
-{
- int game_status_last = game_status;
-
- SetGameStatus(GAME_MODE_LOADING);
-
- UPDATE_BUSY_STATE();
-
- SetGameStatus(game_status_last);
-}
-
static boolean PlayScoreTape_WaitForDownload(void)
{
- unsigned int download_delay = 0;
- unsigned int download_delay_value = 10000;
+ DelayCounter download_delay = { 10000 };
ResetDelayCounter(&download_delay);
// wait for score tape to be successfully downloaded (and fail on timeout)
while (!server_scores.tape_downloaded)
{
- if (DelayReached(&download_delay, download_delay_value))
+ if (DelayReached(&download_delay))
return FALSE;
- PlayScoreTape_UpdateBusyState();
+ UPDATE_BUSY_STATE_NOT_LOADING();
Delay(20);
}
boolean PlayScoreTape(int entry_nr)
{
struct ScoreEntry *entry = &scores.entry[entry_nr];
- char *tape_filename = getScoreTapeFilename(entry->tape_basename, level_nr);
+ char *tape_filename =
+ (entry->id == -1 ?
+ getScoreTapeFilename(entry->tape_basename, level_nr) :
+ getScoreCacheTapeFilename(entry->tape_basename, level_nr));
boolean download_tape = (!fileExists(tape_filename));
- if (entry->id == -1)
+ if (download_tape && entry->id == -1)
+ {
+ FadeSkipNextFadeIn();
+
+ Request("Cannot find score tape!", REQ_CONFIRM);
+
return FALSE;
+ }
server_scores.tape_downloaded = FALSE;
// if tape recorder already contains a tape, remove it without asking
TapeErase();
- LoadScoreTape(entry->tape_basename, level_nr);
+ if (entry->id == -1)
+ LoadScoreTape(entry->tape_basename, level_nr);
+ else
+ LoadScoreCacheTape(entry->tape_basename, level_nr);
if (TAPE_IS_EMPTY(tape))
{
static boolean AutoPlayTapes_WaitForUpload(void)
{
- unsigned int upload_delay = 0;
- unsigned int upload_delay_value = 10000;
+ DelayCounter upload_delay = { 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))
+ if (DelayReached(&upload_delay))
{
PrintNoLog("\r");
Print("- uploading score tape to score server - TIMEOUT.\n");