projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added optional button to restart game (door, panel and touch variants)
[rocksndiamonds.git]
/
src
/
tape.c
diff --git
a/src/tape.c
b/src/tape.c
index e0491485339bab365025f3fc24363b5c6c656eb7..f16e7ec9451a20ab68068add00155ed01870088a 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-664,6
+664,7
@@
void TapeErase(void)
tape.level_nr = level_nr;
tape.pos[tape.counter].delay = 0;
tape.changed = TRUE;
tape.level_nr = level_nr;
tape.pos[tape.counter].delay = 0;
tape.changed = TRUE;
+ tape.solved = FALSE;
tape.random_seed = InitRND(level.random_seed);
tape.random_seed = InitRND(level.random_seed);
@@
-760,6
+761,7
@@
static void TapeAppendRecording(void)
// start recording
tape.recording = TRUE;
tape.changed = TRUE;
// 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;
// set current delay (for last played move)
tape.pos[tape.counter].delay = tape.delay_played;
@@
-777,7
+779,9
@@
static void TapeAppendRecording(void)
void TapeHaltRecording(void)
{
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)
// initialize delay for next tape entry (to be able to continue recording)
if (tape.counter < MAX_TAPE_LEN)
@@
-832,6
+836,8
@@
boolean TapeAddAction(byte action[MAX_TAPE_ACTIONS])
tape.pos[tape.counter].delay++;
}
tape.pos[tape.counter].delay++;
}
+ tape.changed = TRUE;
+
return TRUE;
}
return TRUE;
}
@@
-930,6
+936,10
@@
void TapeTogglePause(boolean toggle_mode)
ModifyPauseButtons();
}
ModifyPauseButtons();
}
+
+ // stop tape when leaving auto-pause after completely replaying tape
+ if (tape.playing && !tape.pausing && tape.counter >= tape.length)
+ TapeStop();
}
void TapeStartPlaying(void)
}
void TapeStartPlaying(void)
@@
-992,16
+1002,22
@@
byte *TapePlayAction(void)
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
+ if (setup.autorecord_after_replay)
+ TapeAppendRecording();
+
return NULL;
}
}
if (tape.counter >= tape.length) // end of tape reached
{
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);
{
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
+ if (setup.autorecord_after_replay)
+ TapeAppendRecording();
}
else
{
}
else
{
@@
-1177,22
+1193,25
@@
static void TapeSingleStep(void)
void TapeQuickSave(void)
{
void TapeQuickSave(void)
{
- if (game_status
== GAME_MODE_MAIN
)
+ if (game_status
!= GAME_MODE_PLAYING
)
{
{
- Request("No game that c
an
be saved!", REQ_CONFIRM);
+ Request("No game that c
ould
be saved!", REQ_CONFIRM);
return;
}
return;
}
- if (game_status != GAME_MODE_PLAYING)
+ if (!tape.recording)
+ {
+ Request("No recording that could be saved!", REQ_CONFIRM);
+
return;
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))
{
if (TAPE_IS_EMPTY(tape))
{
- Request("No tape that c
an
be saved!", REQ_CONFIRM);
+ Request("No tape that c
ould
be saved!", REQ_CONFIRM);
return;
}
return;
}
@@
-1378,31
+1397,19
@@
boolean PlaySolutionTape(void)
return TRUE;
}
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)
{
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)
{
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;
return FALSE;
-
PlayScoreTape_UpdateBusyState
();
+
UPDATE_BUSY_STATE_NOT_LOADING
();
Delay(20);
}
Delay(20);
}
@@
-1413,11
+1420,20
@@
static boolean PlayScoreTape_WaitForDownload(void)
boolean PlayScoreTape(int entry_nr)
{
struct ScoreEntry *entry = &scores.entry[entry_nr];
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));
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;
return FALSE;
+ }
server_scores.tape_downloaded = FALSE;
server_scores.tape_downloaded = FALSE;
@@
-1444,7
+1460,10
@@
boolean PlayScoreTape(int entry_nr)
// if tape recorder already contains a tape, remove it without asking
TapeErase();
// 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))
{
if (TAPE_IS_EMPTY(tape))
{
@@
-1577,15
+1596,14
@@
static void AutoPlayTapes_SetScoreEntry(int score, int time)
static boolean AutoPlayTapes_WaitForUpload(void)
{
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)
{
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");
{
PrintNoLog("\r");
Print("- uploading score tape to score server - TIMEOUT.\n");