projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed setting global animation sync frame when started with ".init_event"
[rocksndiamonds.git]
/
src
/
tape.c
diff --git
a/src/tape.c
b/src/tape.c
index eb825c8d98c49924fa69aa95e806bd63c20baa92..f16e7ec9451a20ab68068add00155ed01870088a 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-779,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)
@@
-834,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;
}
@@
-932,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)
@@
-994,6
+1002,9
@@
byte *TapePlayAction(void)
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
+ if (setup.autorecord_after_replay)
+ TapeAppendRecording();
+
return NULL;
}
}
return NULL;
}
}
@@
-1004,6
+1015,9
@@
byte *TapePlayAction(void)
{
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
{
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
+ if (setup.autorecord_after_replay)
+ TapeAppendRecording();
}
else
{
}
else
{
@@
-1179,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;
}