X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=689f2bf2e0dfbae9fdeacaed1392a639da5c282a;hp=e42540362be36ba299b4157ed4904b707cc83b42;hb=6cf34a189f4a3707c9131652621dd67731f14f6b;hpb=bdbb5c9f4134f280e866bd176cf352b822ebdc00 diff --git a/src/tape.c b/src/tape.c index e4254036..689f2bf2 100644 --- a/src/tape.c +++ b/src/tape.c @@ -28,8 +28,10 @@ #define TAPE_CTRL_ID_PAUSE 3 #define TAPE_CTRL_ID_RECORD 4 #define TAPE_CTRL_ID_PLAY 5 +#define TAPE_CTRL_ID_INSERT_SOLUTION 6 +#define TAPE_CTRL_ID_PLAY_SOLUTION 7 -#define NUM_TAPE_BUTTONS 6 +#define NUM_TAPE_BUTTONS 8 /* values for tape handling */ #define TAPE_PAUSE_SECONDS_BEFORE_DEATH 5 @@ -37,6 +39,7 @@ /* forward declaration for internal use */ static void HandleTapeButtons(struct GadgetInfo *); static void TapeStopWarpForward(); +static float GetTapeLengthSecondsFloat(); static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; @@ -484,11 +487,13 @@ void PrintTapeReplayProgress(boolean replay_finished) } else { + float tape_length_seconds = GetTapeLengthSecondsFloat(); + PrintNoLog("\r"); Print("Level %03d [%02d:%02d]: (%02d:%02d.%03d / %.2f %%) - %s.\n", level_nr, tape.length_seconds / 60, tape.length_seconds % 60, counter_seconds / 60, counter_seconds % 60, counter % 1000, - (float)counter / tape.length_seconds / 10, + (float)counter / tape_length_seconds / 10, tape.auto_play_level_solved ? "solved" : "NOT SOLVED"); counter_last = -1; @@ -541,6 +546,8 @@ void TapeErase() tape.centered_player_nr_next = -1; tape.set_centered_player = FALSE; + + tape.use_mouse = (level.game_engine_type == GAME_ENGINE_TYPE_MM); } static void TapeRewind() @@ -593,18 +600,7 @@ void TapeStartRecording(int random_seed) static void TapeStartGameRecording() { - TapeStartRecording(level.random_seed); - -#if defined(NETWORK_AVALIABLE) - if (options.network) - { - SendToServer_StartPlaying(); - - return; - } -#endif - - InitGame(); + StartGameActions(network.enabled, TRUE, level.random_seed); } static void TapeAppendRecording() @@ -706,7 +702,7 @@ void TapeRecordAction(byte action_raw[MAX_PLAYERS]) for (i = 0; i < MAX_PLAYERS; i++) action[i] = action_raw[i]; - if (tape.set_centered_player) + if (!tape.use_mouse && tape.set_centered_player) { for (i = 0; i < MAX_PLAYERS; i++) if (tape.centered_player_nr_next == i || @@ -884,16 +880,19 @@ byte *TapePlayAction() tape.set_centered_player = FALSE; tape.centered_player_nr_next = -999; - for (i = 0; i < MAX_PLAYERS; i++) + if (!tape.use_mouse) { - if (action[i] & KEY_SET_FOCUS) + for (i = 0; i < MAX_PLAYERS; i++) { - tape.set_centered_player = TRUE; - tape.centered_player_nr_next = - (tape.centered_player_nr_next == -999 ? i : -1); - } + 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; + action[i] &= ~KEY_SET_FOCUS; + } } tape.delay_played++; @@ -911,6 +910,9 @@ byte *TapePlayAction() void TapeStop() { + if (tape.pausing) + TapeTogglePause(TAPE_TOGGLE_MANUAL); + TapeStopRecording(); TapeStopPlaying(); @@ -943,6 +945,11 @@ unsigned int GetTapeLengthSeconds() return (GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000); } +static float GetTapeLengthSecondsFloat() +{ + return ((float)GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000); +} + static void TapeStartWarpForward(int mode) { tape.fast_forward = (mode & AUTOPLAY_FFWD); @@ -972,7 +979,7 @@ static void TapeStopWarpForward() static void TapeSingleStep() { - if (options.network) + if (network.enabled) return; if (!tape.pausing) @@ -1072,27 +1079,52 @@ void TapeQuickLoad() } } -void InsertSolutionTape() +boolean hasSolutionTape() { + boolean tape_file_exists = fileExists(getSolutionTapeFilename(level_nr)); boolean level_has_tape = (level.game_engine_type == GAME_ENGINE_TYPE_SP && level.native_sp_level->demo.is_available); - if (!fileExists(getSolutionTapeFilename(level_nr)) && !level_has_tape) + return (tape_file_exists || level_has_tape); +} + +boolean InsertSolutionTape() +{ + if (!hasSolutionTape()) { Request("No solution tape for this level!", REQ_CONFIRM); - return; + return FALSE; } + if (!TAPE_IS_STOPPED(tape)) + TapeStop(); + // if tape recorder already contains a tape, remove it without asking TapeErase(); LoadSolutionTape(level_nr); + DrawCompleteVideoDisplay(); + if (TAPE_IS_EMPTY(tape)) + { Request("Loading solution tape for this level failed!", REQ_CONFIRM); - DrawCompleteVideoDisplay(); + return FALSE; + } + + return TRUE; +} + +boolean PlaySolutionTape() +{ + if (!InsertSolutionTape()) + return FALSE; + + TapeStartGamePlaying(); + + return TRUE; } @@ -1268,6 +1300,14 @@ static struct { IMG_GFX_TAPE_BUTTON_PLAY, &tape.button.play, TAPE_CTRL_ID_PLAY, "play tape" + }, + { + IMG_GFX_TAPE_BUTTON_INSERT_SOLUTION,&tape.button.insert_solution, + TAPE_CTRL_ID_INSERT_SOLUTION, "insert solution tape" + }, + { + IMG_GFX_TAPE_BUTTON_PLAY_SOLUTION, &tape.button.play_solution, + TAPE_CTRL_ID_PLAY_SOLUTION, "play solution tape" } }; @@ -1277,7 +1317,8 @@ void CreateTapeButtons() for (i = 0; i < NUM_TAPE_BUTTONS; i++) { - struct GraphicInfo *gfx = &graphic_info[tapebutton_info[i].graphic]; + int graphic = tapebutton_info[i].graphic; + struct GraphicInfo *gfx = &graphic_info[graphic]; struct XY *pos = tapebutton_info[i].pos; struct GadgetInfo *gi; int gd_x = gfx->src_x; @@ -1287,6 +1328,7 @@ void CreateTapeButtons() int id = i; gi = CreateGadget(GDI_CUSTOM_ID, id, + GDI_IMAGE_ID, graphic, GDI_INFO_TEXT, tapebutton_info[i].infotext, GDI_X, VX + pos->x, GDI_Y, VY + pos->y, @@ -1340,7 +1382,7 @@ void MapTapeButtons() MapTapeWarpButton(); if (tape.show_game_buttons) - MapGameButtons(); + MapGameButtonsOnTape(); } void UnmapTapeButtons() @@ -1351,7 +1393,7 @@ void UnmapTapeButtons() UnmapGadget(tape_gadget[i]); if (tape.show_game_buttons) - UnmapGameButtons(); + UnmapGameButtonsOnTape(); } void RedrawTapeButtons() @@ -1362,7 +1404,7 @@ void RedrawTapeButtons() RedrawGadget(tape_gadget[i]); if (tape.show_game_buttons) - RedrawGameButtons(); + RedrawGameButtonsOnTape(); // RedrawGadget() may have set REDRAW_ALL if buttons are defined off-area redraw_mask &= ~REDRAW_ALL; @@ -1498,6 +1540,16 @@ static void HandleTapeButtonsExt(int id) break; + case TAPE_CTRL_ID_INSERT_SOLUTION: + InsertSolutionTape(); + + break; + + case TAPE_CTRL_ID_PLAY_SOLUTION: + PlaySolutionTape(); + + break; + default: break; }