projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with tape length less than "pause before end" seconds
[rocksndiamonds.git]
/
src
/
tape.c
diff --git
a/src/tape.c
b/src/tape.c
index 2a1a3ec345e5b65e85279bae23234da2ed97f801..a6ab98561aa32c9f2dcc213cbc07312941cfa3d2 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-985,7
+985,7
@@
byte *TapePlayAction(void)
if (tape.pause_before_end) // stop some seconds before end of tape
{
if (tape.pause_before_end) // stop some seconds before end of tape
{
- if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
+ if (TapeTime >
(int)
tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
{
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
{
TapeStopWarpForward();
TapeTogglePause(TAPE_TOGGLE_MANUAL);
@@
-1381,8
+1381,10
@@
static TreeInfo *getFirstValidAutoPlayEntry(TreeInfo *node)
static void AutoPlayTapes_SetScoreEntry(int score, int time)
{
static void AutoPlayTapes_SetScoreEntry(int score, int time)
{
+ char *name = (options.mytapes ? setup.player_name : options.player_name);
+
// set unique basename for score tape (for uploading to score server)
// set unique basename for score tape (for uploading to score server)
- strcpy(tape.score_tape_basename, getScoreTapeBasename(
setup.player_
name));
+ strcpy(tape.score_tape_basename, getScoreTapeBasename(name));
// store score in first score entry
scores.last_added = 0;
// store score in first score entry
scores.last_added = 0;