X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=49f06aa32272c5f77c13e0de6584d78411a23561;hb=0e9667dbd99ad85fd554c571a9b0e63d7c552551;hp=90435c48179e2ffd7952f53b2f66a8651c256d64;hpb=a8613c2d9809cf90870f7c33b6fda80957241827;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index 90435c48..49f06aa3 100644 --- a/src/tape.c +++ b/src/tape.c @@ -475,7 +475,7 @@ void TapeErase() tape.pos[tape.counter].delay = 0; tape.changed = TRUE; - tape.random_seed = InitRND(NEW_RANDOMIZE); + tape.random_seed = InitRND(level.random_seed); tape.file_version = FILE_VERSION_ACTUAL; tape.game_version = GAME_VERSION_ACTUAL; @@ -538,7 +538,7 @@ void TapeStartRecording(long random_seed) static void TapeStartGameRecording() { - TapeStartRecording(NEW_RANDOMIZE); + TapeStartRecording(level.random_seed); #if defined(NETWORK_AVALIABLE) if (options.network) @@ -566,6 +566,10 @@ static void TapeAppendRecording() DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON, 0); + +#if 1 + UpdateAndDisplayGameControlValues(); +#endif } void TapeHaltRecording() @@ -677,6 +681,9 @@ void TapeTogglePause(boolean toggle_manual) tape.quick_resume = FALSE; TapeAppendRecording(); + + if (!CheckEngineSnapshot()) + SaveEngineSnapshot(); } } } @@ -916,11 +923,14 @@ void TapeQuickSave() TapeHaltRecording(); /* prepare tape for saving on-the-fly */ if (TAPE_IS_EMPTY(tape)) + { Request("No tape that can be saved !", REQ_CONFIRM); - else - SaveTape(tape.level_nr); - SaveEngineSnapshot(); + return; + } + + if (SaveTapeChecked(tape.level_nr)) + SaveEngineSnapshot(); } void TapeQuickLoad() @@ -951,6 +961,8 @@ void TapeQuickLoad() LoadEngineSnapshot(); + DrawCompleteVideoDisplay(); + tape.playing = TRUE; tape.pausing = TRUE; @@ -1231,6 +1243,7 @@ void CreateTapeButtons() GDI_STATE, GD_BUTTON_UNPRESSED, GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y, GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y, + GDI_DIRECT_DRAW, FALSE, GDI_EVENT_MASK, GD_EVENT_RELEASED, GDI_CALLBACK_ACTION, HandleTapeButtons, GDI_END); @@ -1293,18 +1306,22 @@ static void HandleTapeButtons(struct GadgetInfo *gi) { case TAPE_CTRL_ID_EJECT: TapeStop(); + if (TAPE_IS_EMPTY(tape)) { LoadTape(level_nr); + if (TAPE_IS_EMPTY(tape)) Request("No tape for this level !", REQ_CONFIRM); } else { if (tape.changed) - SaveTape(tape.level_nr); + SaveTapeChecked(tape.level_nr); + TapeErase(); } + DrawCompleteVideoDisplay(); break; @@ -1322,6 +1339,7 @@ static void HandleTapeButtons(struct GadgetInfo *gi) } else if (tape.recording) TapeSingleStep(); + break; case TAPE_CTRL_ID_STOP: