X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=5c90cb416d074b931f45df93e919b24fdf1b268d;hp=05c6f7c2d2c8640a4db2c62f74f52cdfa5ce3ad2;hb=c6d59064aa782b8ad71eddac2797fdc50e4858f9;hpb=1e57e2856183b3ea50b298ec6ffb4307b584c056 diff --git a/src/tape.c b/src/tape.c index 05c6f7c2..5c90cb41 100644 --- a/src/tape.c +++ b/src/tape.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -345,102 +345,6 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) }, }; -#if 0 - if (state & VIDEO_STATE_FFWD_OFF) - { -#if 1 - int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; - - if (value != VIDEO_DISPLAY_SYMBOL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_LABEL_XPOS, - cy + VIDEO_LABEL_YPOS, - VIDEO_LABEL_XSIZE, - VIDEO_LABEL_YSIZE, - VX + VIDEO_LABEL_XPOS, - VY + VIDEO_LABEL_YPOS); - - cx = DOOR_GFX_PAGEX3; - cy = DOOR_GFX_PAGEY2; - - if (value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_FFWD_SYMBOL_XPOS, - cy + VIDEO_SYMBOL_YPOS, - VIDEO_FFWD_SYMBOL_XSIZE, - VIDEO_FFWD_SYMBOL_YSIZE, - VX + VIDEO_SYMBOL_XPOS, - VY + VIDEO_SYMBOL_YPOS); -#else - int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; - - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_PLAY_SYMBOL_XPOS - 9, - cy + VIDEO_PLAY_SYMBOL_YPOS, - VIDEO_PLAY_SYMBOL_XSIZE - 2, - VIDEO_PLAY_SYMBOL_YSIZE, - VX + VIDEO_PLAY_SYMBOL_XPOS - 9, - VY + VIDEO_PLAY_SYMBOL_YPOS); -#endif - } -#endif - -#if 0 - if (state & VIDEO_STATE_PBEND_OFF) - { -#if 1 - int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; - - if (value != VIDEO_DISPLAY_SYMBOL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_LABEL_XPOS, - cy + VIDEO_LABEL_YPOS, - VIDEO_LABEL_XSIZE, - VIDEO_LABEL_YSIZE, - VX + VIDEO_LABEL_XPOS, - VY + VIDEO_LABEL_YPOS); - - cx = DOOR_GFX_PAGEX3; - cy = DOOR_GFX_PAGEY2; - - if (value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_PBEND_SYMBOL_XPOS, - cy + VIDEO_SYMBOL_YPOS, - VIDEO_PBEND_SYMBOL_XSIZE, - VIDEO_PBEND_SYMBOL_YSIZE, - VX + VIDEO_PBEND_SYMBOL_XPOS, - VY + VIDEO_SYMBOL_YPOS); -#else - int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; - - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_REC_LABEL_XPOS, - cy + VIDEO_REC_LABEL_YPOS, - VIDEO_PBEND_LABEL_XSIZE, - VIDEO_PBEND_LABEL_YSIZE, - VX + VIDEO_REC_LABEL_XPOS, - VY + VIDEO_REC_LABEL_YPOS); -#endif - } -#endif - -#if 0 - if (state & VIDEO_STATE_1STEP_OFF) - { - int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; - - if (value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_1STEP_SYMBOL_XPOS, - cy + VIDEO_SYMBOL_YPOS, - VIDEO_1STEP_SYMBOL_XSIZE, - VIDEO_1STEP_SYMBOL_YSIZE, - VX + VIDEO_1STEP_SYMBOL_XPOS, - VY + VIDEO_SYMBOL_YPOS); - } -#endif - for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++) /* on or off states */ { for (i = 0; i < NUM_TAPE_FUNCTIONS; i++) /* record, play, ... */ @@ -476,102 +380,6 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) } } -#if 0 - if (state & VIDEO_STATE_FFWD_ON) - { -#if 1 - int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; - - if (value != VIDEO_DISPLAY_SYMBOL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_FFWD_LABEL_XPOS, - cy + VIDEO_FFWD_LABEL_YPOS, - VIDEO_LABEL_XSIZE, - VIDEO_LABEL_YSIZE, - VX + VIDEO_LABEL_XPOS, - VY + VIDEO_LABEL_YPOS); - - cx = DOOR_GFX_PAGEX6; - cy = DOOR_GFX_PAGEY1; - - if (value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_FFWD_SYMBOL_XPOS, - cy + VIDEO_FFWD_SYMBOL_YPOS, - VIDEO_FFWD_SYMBOL_XSIZE, - VIDEO_FFWD_SYMBOL_YSIZE, - VX + VIDEO_SYMBOL_XPOS, - VY + VIDEO_SYMBOL_YPOS); -#else - int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2; - - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_PLAY_SYMBOL_XPOS, - cy + VIDEO_PLAY_SYMBOL_YPOS, - VIDEO_PLAY_SYMBOL_XSIZE - 2, - VIDEO_PLAY_SYMBOL_YSIZE, - VX + VIDEO_PLAY_SYMBOL_XPOS - 9, - VY + VIDEO_PLAY_SYMBOL_YPOS); -#endif - } -#endif - -#if 0 - if (state & VIDEO_STATE_PBEND_ON) - { -#if 1 - int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; - - if (value != VIDEO_DISPLAY_SYMBOL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_PBEND_LABEL_XPOS, - cy + VIDEO_PBEND_LABEL_YPOS, - VIDEO_LABEL_XSIZE, - VIDEO_LABEL_YSIZE, - VX + VIDEO_LABEL_XPOS, - VY + VIDEO_LABEL_YPOS); - - cx = DOOR_GFX_PAGEX6; - cy = DOOR_GFX_PAGEY1; - - if (value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_PBEND_SYMBOL_XPOS, - cy + VIDEO_PBEND_SYMBOL_YPOS, - VIDEO_PBEND_SYMBOL_XSIZE, - VIDEO_PBEND_SYMBOL_YSIZE, - VX + VIDEO_SYMBOL_XPOS, - VY + VIDEO_SYMBOL_YPOS); -#else - int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; - - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_PBEND_LABEL_XPOS, - cy + VIDEO_PBEND_LABEL_YPOS, - VIDEO_PBEND_LABEL_XSIZE, - VIDEO_PBEND_LABEL_YSIZE, - VX + VIDEO_REC_LABEL_XPOS, - VY + VIDEO_REC_LABEL_YPOS); -#endif - } -#endif - -#if 0 - if (state & VIDEO_STATE_1STEP_ON) - { - int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; - - if (value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - cx + VIDEO_1STEP_SYMBOL_XPOS, - cy + VIDEO_1STEP_SYMBOL_YPOS, - VIDEO_1STEP_SYMBOL_XSIZE, - VIDEO_1STEP_SYMBOL_YSIZE, - VX + VIDEO_1STEP_SYMBOL_XPOS, - VY + VIDEO_SYMBOL_YPOS); - } -#endif - if (state & VIDEO_STATE_DATE_ON) { int tag = value % 100; @@ -597,20 +405,17 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) int2str(sec, 2), FONT_TAPE_RECORDER); } -#if 1 redraw_mask |= REDRAW_DOOR_2; -#else - if (state & VIDEO_STATE_DATE) - redraw_mask |= REDRAW_VIDEO_1; - if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE) - redraw_mask |= REDRAW_VIDEO_2; - if (state & VIDEO_PRESS) - redraw_mask |= REDRAW_VIDEO_3; -#endif } void DrawCompleteVideoDisplay() { +#if 0 + printf("::: %d, %d / %d, %d [%d] [%d, %d] [%d/%d]\n", + VX, VY, EX, EY, game_status, gfx.vx, gfx.vy, + tape.date, tape.length); +#endif + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, DOOR_GFX_PAGEX3, DOOR_GFX_PAGEY2, gfx.vxsize, gfx.vysize, gfx.vx, gfx.vy); @@ -621,11 +426,38 @@ void DrawCompleteVideoDisplay() gfx.vx + VIDEO_CONTROL_XPOS, gfx.vy + VIDEO_CONTROL_YPOS); DrawVideoDisplay(VIDEO_ALL_OFF, 0); + +#if 1 + if (tape.recording) + { + DrawVideoDisplay(VIDEO_STATE_REC_ON, 0); + DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); + DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds); + + if (tape.pausing) + DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0); + } + else if (tape.playing) + { + DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0); + DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); + DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); + + if (tape.pausing) + DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0); + } + else if (tape.date && tape.length) + { + DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); + DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds); + } +#else if (tape.date && tape.length) { DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds); } +#endif BlitBitmap(drawto, bitmap_db_door, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2); @@ -654,20 +486,25 @@ void TapeDeactivateDisplayOff(boolean redraw_display) /* tape control functions */ /* ========================================================================= */ -static void TapeSetDate() +void TapeSetDateFromEpochSeconds(time_t epoch_seconds) { - time_t epoch_seconds = time(NULL); - struct tm *now = localtime(&epoch_seconds); + struct tm *lt = localtime(&epoch_seconds); - tape.date = 10000 * (now->tm_year % 100) + 100 * now->tm_mon + now->tm_mday; + tape.date = 10000 * (lt->tm_year % 100) + 100 * lt->tm_mon + lt->tm_mday; +} + +void TapeSetDateFromNow() +{ + TapeSetDateFromEpochSeconds(time(NULL)); } void TapeErase() { int i; - tape.length = 0; tape.counter = 0; + tape.length = 0; + tape.length_seconds = 0; if (leveldir_current) setString(&tape.level_identifier, leveldir_current->identifier); @@ -676,21 +513,19 @@ 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; tape.engine_version = level.game_version; - TapeSetDate(); - -#if 0 - printf("::: tape.engine_version = level.game_version = %d \n", - level.game_version); -#endif + TapeSetDateFromNow(); for (i = 0; i < MAX_PLAYERS; i++) tape.player_participates[i] = FALSE; + + tape.centered_player_nr_next = -1; + tape.set_centered_player = FALSE; } static void TapeRewind() @@ -708,22 +543,32 @@ static void TapeRewind() tape.quick_resume = FALSE; tape.single_step = FALSE; + tape.centered_player_nr_next = -1; + tape.set_centered_player = FALSE; + InitRND(tape.random_seed); } -void TapeStartRecording() +static void TapeSetRandomSeed(long random_seed) +{ + tape.random_seed = InitRND(random_seed); +} + +void TapeStartRecording(long random_seed) { if (!TAPE_IS_STOPPED(tape)) TapeStop(); TapeErase(); TapeRewind(); + TapeSetRandomSeed(random_seed); tape.recording = TRUE; DrawVideoDisplay(VIDEO_STATE_REC_ON, 0); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); + MapTapeWarpButton(); SetDrawDeactivationMask(REDRAW_NONE); @@ -732,18 +577,18 @@ void TapeStartRecording() static void TapeStartGameRecording() { - TapeStartRecording(); + TapeStartRecording(level.random_seed); #if defined(NETWORK_AVALIABLE) if (options.network) - SendToServer_StartPlaying(); - else -#endif { - game_status = GAME_MODE_PLAYING; - StopAnimation(); - InitGame(); + SendToServer_StartPlaying(); + + return; } +#endif + + InitGame(); } static void TapeAppendRecording() @@ -756,10 +601,14 @@ static void TapeAppendRecording() tape.recording = TRUE; tape.changed = TRUE; - TapeSetDate(); + TapeSetDateFromNow(); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON, 0); + +#if 1 + UpdateAndDisplayGameControlValues(); +#endif } void TapeHaltRecording() @@ -776,11 +625,6 @@ void TapeHaltRecording() void TapeStopRecording() { -#if 0 - if (!tape.recording) - return; -#endif - TapeHaltRecording(); tape.recording = FALSE; @@ -790,17 +634,13 @@ void TapeStopRecording() MapTapeEjectButton(); } -void TapeRecordAction(byte action[MAX_PLAYERS]) +void TapeRecordAction(byte action_raw[MAX_PLAYERS]) { + byte action[MAX_PLAYERS]; int i; -#if 1 - if (!tape.recording) /* record action even when tape is paused! */ - return; -#else - if (!tape.recording || tape.pausing) + if (!tape.recording) /* (record action even when tape is paused) */ return; -#endif if (tape.counter >= MAX_TAPE_LEN - 1) { @@ -808,9 +648,18 @@ void TapeRecordAction(byte action[MAX_PLAYERS]) return; } -#if 0 - printf("::: %05d: recording action: %d\n", FrameCounter, action[0]); -#endif + for (i = 0; i < MAX_PLAYERS; i++) + action[i] = action_raw[i]; + + if (tape.set_centered_player) + { + for (i = 0; i < MAX_PLAYERS; i++) + if (tape.centered_player_nr_next == i || + tape.centered_player_nr_next == -1) + action[i] |= KEY_SET_FOCUS; + + tape.set_centered_player = FALSE; + } if (tape.pos[tape.counter].delay > 0) /* already stored action */ { @@ -831,11 +680,6 @@ void TapeRecordAction(byte action[MAX_PLAYERS]) if (tape.pos[tape.counter].delay == 0) /* store new action */ { - -#if 0 - printf("::: %05d: new sequence\n", FrameCounter); -#endif - for (i = 0; i < MAX_PLAYERS; i++) tape.pos[tape.counter].action[i] = action[i]; @@ -847,11 +691,6 @@ void TapeTogglePause(boolean toggle_manual) { int state = 0; -#if 0 - if (!tape.recording && !tape.playing) - return; -#endif - if (tape.pause_before_death) state |= VIDEO_STATE_PBEND_OFF; else if (tape.fast_forward) @@ -872,11 +711,6 @@ void TapeTogglePause(boolean toggle_manual) DrawVideoDisplay(state, 0); -#if 0 - if (tape.pausing) - DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0); -#endif - if (tape.warp_forward) { TapeStopWarpForward(); @@ -886,9 +720,9 @@ void TapeTogglePause(boolean toggle_manual) tape.quick_resume = FALSE; TapeAppendRecording(); -#if 0 - TapeTogglePause(toggle_manual); -#endif + + if (!CheckEngineSnapshot()) + SaveEngineSnapshot(); } } } @@ -908,6 +742,7 @@ void TapeStartPlaying() DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); + MapTapeWarpButton(); SetDrawDeactivationMask(REDRAW_NONE); @@ -918,18 +753,11 @@ static void TapeStartGamePlaying() { TapeStartPlaying(); - game_status = GAME_MODE_PLAYING; - StopAnimation(); InitGame(); } void TapeStopPlaying() { -#if 0 - if (!tape.playing) - return; -#endif - tape.playing = FALSE; tape.pausing = FALSE; @@ -1015,6 +843,21 @@ byte *TapePlayAction() for (i = 0; i < MAX_PLAYERS; i++) action[i] = tape.pos[tape.counter].action[i]; + tape.set_centered_player = FALSE; + tape.centered_player_nr_next = -999; + + for (i = 0; i < MAX_PLAYERS; i++) + { + if (action[i] & KEY_SET_FOCUS) + { + tape.set_centered_player = TRUE; + tape.centered_player_nr_next = + (tape.centered_player_nr_next == -999 ? i : -1); + } + + action[i] &= ~KEY_SET_FOCUS; + } + tape.delay_played++; if (tape.delay_played >= tape.pos[tape.counter].delay) { @@ -1022,22 +865,11 @@ byte *TapePlayAction() tape.delay_played = 0; } -#if 0 - printf("::: %05d: replaying action: %d\n", FrameCounter, action[0]); -#endif - return action; } void TapeStop() { -#if 0 - if (tape.recording) - printf("::: stopped recording: %d\n", FrameCounter); - else if (tape.playing) - printf("::: stopped playing: %d\n\n", FrameCounter); -#endif - TapeStopRecording(); TapeStopPlaying(); @@ -1048,11 +880,6 @@ void TapeStop() DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds); } - -#if 0 - if (tape.auto_play) - AutoPlayTape(); /* continue automatically playing next tape */ -#endif } unsigned int GetTapeLength() @@ -1073,7 +900,6 @@ static void TapeStartWarpForward() { tape.warp_forward = TRUE; -#if 1 if (!tape.fast_forward && !tape.pause_before_death) { tape.pausing = FALSE; @@ -1081,15 +907,6 @@ static void TapeStartWarpForward() TapeDeactivateDisplayOn(); } -#else - if (!tape.fast_forward || tape.pause_before_death) - { - tape.pausing = FALSE; - tape.deactivate_display = TRUE; - - TapeDeactivateDisplayOn(); - } -#endif if (tape.fast_forward || tape.pause_before_death) DrawVideoDisplay(VIDEO_STATE_WARP_ON, VIDEO_DISPLAY_SYMBOL_ONLY); @@ -1106,16 +923,6 @@ static void TapeStopWarpForward() TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING); -#if 0 -#if 1 - if (game_status == GAME_MODE_PLAYING) -#endif - { - RedrawPlayfield(TRUE, 0,0,0,0); - DrawGameDoorValues(); - } -#endif - if (tape.pause_before_death) state |= VIDEO_STATE_WARP_OFF | VIDEO_STATE_PBEND_ON; else if (tape.fast_forward) @@ -1142,18 +949,28 @@ static void TapeSingleStep() void TapeQuickSave() { - if (game_status == GAME_MODE_PLAYING) + if (game_status == GAME_MODE_MAIN) { - if (tape.recording) - TapeHaltRecording(); /* prepare tape for saving on-the-fly */ + Request("No game that can be saved !", REQ_CONFIRM); - if (TAPE_IS_EMPTY(tape)) - Request("No tape that can be saved !", REQ_CONFIRM); - else - SaveTape(tape.level_nr); + return; } - else if (game_status == GAME_MODE_MAIN) - Request("No game that can be saved !", REQ_CONFIRM); + + if (game_status != GAME_MODE_PLAYING) + return; + + if (tape.recording) + TapeHaltRecording(); /* prepare tape for saving on-the-fly */ + + if (TAPE_IS_EMPTY(tape)) + { + Request("No tape that can be saved !", REQ_CONFIRM); + + return; + } + + if (SaveTapeChecked(tape.level_nr)) + SaveEngineSnapshot(); } void TapeQuickLoad() @@ -1175,25 +992,44 @@ void TapeQuickLoad() return; } - if (game_status == GAME_MODE_PLAYING || game_status == GAME_MODE_MAIN) + if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN) + return; + + if (CheckEngineSnapshot()) { - TapeStop(); - TapeErase(); + TapeStartGamePlaying(); - LoadTape(level_nr); - if (!TAPE_IS_EMPTY(tape)) - { - TapeStartGamePlaying(); - TapeStartWarpForward(); + LoadEngineSnapshot(); - tape.quick_resume = TRUE; - } - else /* this should not happen (basically checked above) */ - { - int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0); + DrawCompleteVideoDisplay(); - Request("No tape for this level !", REQ_CONFIRM | reopen_door); - } + tape.playing = TRUE; + tape.pausing = TRUE; + + TapeStopWarpForward(); + TapeAppendRecording(); + + if (FrameCounter > 0) + return; + } + + TapeStop(); + TapeErase(); + + LoadTape(level_nr); + + if (!TAPE_IS_EMPTY(tape)) + { + TapeStartGamePlaying(); + TapeStartWarpForward(); + + tape.quick_resume = TRUE; + } + else /* this should not happen (basically checked above) */ + { + int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0); + + Request("No tape for this level !", REQ_CONFIRM | reopen_door); } } @@ -1304,11 +1140,8 @@ void AutoPlayTape() #endif LoadSolutionTape(level_nr); -#if 1 + if (tape.no_valid_file) -#else - if (TAPE_IS_EMPTY(tape)) -#endif { num_tape_missing++; if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET) @@ -1450,6 +1283,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); @@ -1501,10 +1335,8 @@ void UnmapTapeButtons() UnmapGadget(tape_gadget[i]); } -static void HandleTapeButtons(struct GadgetInfo *gi) +static void HandleTapeButtonsExt(int id) { - int id = gi->custom_id; - if (game_status != GAME_MODE_MAIN && game_status != GAME_MODE_PLAYING) return; @@ -1512,18 +1344,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; @@ -1537,19 +1373,11 @@ static void HandleTapeButtons(struct GadgetInfo *gi) else /* WARP FORWARD PLAY -> PLAY */ { TapeStopWarpForward(); - -#if 0 - if (tape.pause_before_death) - DrawVideoDisplay(VIDEO_STATE_WARP_OFF | VIDEO_STATE_PLAY_ON, 0); - else if (tape.fast_forward) - DrawVideoDisplay(VIDEO_STATE_WARP_OFF | VIDEO_STATE_FFWD_ON, 0); - else - DrawVideoDisplay(VIDEO_STATE_WARP_OFF | VIDEO_STATE_PBEND_ON, 0); -#endif } } else if (tape.recording) TapeSingleStep(); + break; case TAPE_CTRL_ID_STOP: @@ -1594,28 +1422,17 @@ static void HandleTapeButtons(struct GadgetInfo *gi) else if (!tape.pause_before_death) /* FFWD PLAY -> AUTO PAUSE */ { tape.pause_before_death = TRUE; -#if 1 DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_ON, 0); -#else - DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY); -#endif } else /* AUTO PAUSE -> NORMAL PLAY */ { -#if 1 if (tape.warp_forward) TapeStopWarpForward(); -#else - tape.warp_forward = FALSE; -#endif + tape.fast_forward = FALSE; tape.pause_before_death = FALSE; -#if 1 DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0); -#else - DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_OFF, 0); -#endif } } break; @@ -1624,3 +1441,24 @@ static void HandleTapeButtons(struct GadgetInfo *gi) break; } } + +static void HandleTapeButtons(struct GadgetInfo *gi) +{ + HandleTapeButtonsExt(gi->custom_id); +} + +void HandleTapeButtonKeys(Key key) +{ + boolean use_extra = (tape.recording || tape.playing); + + if (key == setup.shortcut.tape_eject) + HandleTapeButtonsExt(use_extra ? TAPE_CTRL_ID_EXTRA : TAPE_CTRL_ID_EJECT); + else if (key == setup.shortcut.tape_stop) + HandleTapeButtonsExt(TAPE_CTRL_ID_STOP); + else if (key == setup.shortcut.tape_pause) + HandleTapeButtonsExt(TAPE_CTRL_ID_PAUSE); + else if (key == setup.shortcut.tape_record) + HandleTapeButtonsExt(TAPE_CTRL_ID_RECORD); + else if (key == setup.shortcut.tape_play) + HandleTapeButtonsExt(TAPE_CTRL_ID_PLAY); +}