X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=07f8f82234b23f2a3008e2475ce03a49e058cb25;hp=bc258b66fae809f9b53889abf9958a0048b38454;hb=7ecbe0a730dc19d8a46ffe6bbcb052f20d0c4152;hpb=d1eb03c63b0eaa2fd1bfa97d4b68ef678aa07bd2 diff --git a/src/tape.c b/src/tape.c index bc258b66..07f8f822 100644 --- a/src/tape.c +++ b/src/tape.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* tape.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// tape.c +// ============================================================================ #include "libgame/libgame.h" @@ -21,6 +19,8 @@ #include "network.h" #include "cartoons.h" +#define DEBUG_TAPE_WHEN_PLAYING FALSE + /* tape button identifiers */ #define TAPE_CTRL_ID_EJECT 0 #define TAPE_CTRL_ID_EXTRA 1 @@ -139,7 +139,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; #define PG_Y2(y) (DOOR_GFX_PAGEY2 + (y)) #define VIDEO_INFO_OFF (VIDEO_STATE_DATE_OFF | \ - VIDEO_STATE_TIME_OFF) + VIDEO_STATE_TIME_OFF | \ + VIDEO_STATE_FRAME_OFF) #define VIDEO_STATE_OFF (VIDEO_STATE_PLAY_OFF | \ VIDEO_STATE_REC_OFF | \ VIDEO_STATE_PAUSE_OFF | \ @@ -156,7 +157,8 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; VIDEO_PRESS_OFF) #define VIDEO_INFO_ON (VIDEO_STATE_DATE_ON | \ - VIDEO_STATE_TIME_ON) + VIDEO_STATE_TIME_ON | \ + VIDEO_STATE_FRAME_ON) #define VIDEO_STATE_ON (VIDEO_STATE_PLAY_ON | \ VIDEO_STATE_REC_ON | \ VIDEO_STATE_PAUSE_ON | \ @@ -177,7 +179,7 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; #define VIDEO_PRESS (VIDEO_PRESS_ON | VIDEO_PRESS_OFF) #define VIDEO_ALL (VIDEO_ALL_ON | VIDEO_ALL_OFF) -#define NUM_TAPE_FUNCTIONS 10 +#define NUM_TAPE_FUNCTIONS 11 #define NUM_TAPE_FUNCTION_PARTS 2 #define NUM_TAPE_FUNCTION_STATES 2 @@ -186,173 +188,14 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS]; /* video display functions */ /* ========================================================================= */ -void DrawVideoDisplay(unsigned long state, unsigned long value) +static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value) { int i, j, k; - static char *monatsname[12] = - { - "JAN", "FEB", "MAR", "APR", "MAY", "JUN", - "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" - }; - -#if 0 - static struct - { - int gd_x1, gd_y1; - int gd_x2, gd_y2; - int x, y; - int width, height; - } - video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] = - { - { - { - PG_X4(VIDEO_PLAY_LABEL_XPOS), PG_Y2(VIDEO_PLAY_LABEL_YPOS), - PG_X3(VIDEO_PLAY_LABEL_XPOS), PG_Y2(VIDEO_PLAY_LABEL_YPOS), - VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS, - VIDEO_PLAY_LABEL_XSIZE, VIDEO_PLAY_LABEL_YSIZE - }, - { - PG_X4(VIDEO_PLAY_SYMBOL_XPOS), PG_Y2(VIDEO_PLAY_SYMBOL_YPOS), - PG_X3(VIDEO_PLAY_SYMBOL_XPOS), PG_Y2(VIDEO_PLAY_SYMBOL_YPOS), - VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS, - VIDEO_PLAY_SYMBOL_XSIZE, VIDEO_PLAY_SYMBOL_YSIZE - } - }, - { - { - PG_X4(VIDEO_REC_LABEL_XPOS), PG_Y2(VIDEO_REC_LABEL_YPOS), - PG_X3(VIDEO_REC_LABEL_XPOS), PG_Y2(VIDEO_REC_LABEL_YPOS), - VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS, - VIDEO_REC_LABEL_XSIZE, VIDEO_REC_LABEL_YSIZE - }, - { - PG_X4(VIDEO_REC_SYMBOL_XPOS), PG_Y2(VIDEO_REC_SYMBOL_YPOS), - PG_X3(VIDEO_REC_SYMBOL_XPOS), PG_Y2(VIDEO_REC_SYMBOL_YPOS), - VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS, - VIDEO_REC_SYMBOL_XSIZE, VIDEO_REC_SYMBOL_YSIZE - } - }, - { - { - PG_X4(VIDEO_PAUSE_LABEL_XPOS), PG_Y2(VIDEO_PAUSE_LABEL_YPOS), - PG_X3(VIDEO_PAUSE_LABEL_XPOS), PG_Y2(VIDEO_PAUSE_LABEL_YPOS), - VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS, - VIDEO_PAUSE_LABEL_XSIZE, VIDEO_PAUSE_LABEL_YSIZE - }, - { - PG_X4(VIDEO_PAUSE_SYMBOL_XPOS), PG_Y2(VIDEO_PAUSE_SYMBOL_YPOS), - PG_X3(VIDEO_PAUSE_SYMBOL_XPOS), PG_Y2(VIDEO_PAUSE_SYMBOL_YPOS), - VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS, - VIDEO_PAUSE_SYMBOL_XSIZE, VIDEO_PAUSE_SYMBOL_YSIZE - } - }, - { - { - PG_X4(VIDEO_DATE_LABEL_XPOS), PG_Y2(VIDEO_DATE_LABEL_YPOS), - PG_X3(VIDEO_DATE_LABEL_XPOS), PG_Y2(VIDEO_DATE_LABEL_YPOS), - VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS, - VIDEO_DATE_LABEL_XSIZE, VIDEO_DATE_LABEL_YSIZE - }, - { - PG_X4(VIDEO_DATE_XPOS), PG_Y2(VIDEO_DATE_YPOS), - PG_X3(VIDEO_DATE_XPOS), PG_Y2(VIDEO_DATE_YPOS), - VIDEO_DATE_XPOS, VIDEO_DATE_YPOS, - VIDEO_DATE_XSIZE, VIDEO_DATE_YSIZE - } - }, - { - { - -1, -1, - -1, -1, - -1, -1, - -1, -1 - }, - { - PG_X4(VIDEO_TIME_XPOS), PG_Y2(VIDEO_TIME_YPOS), - PG_X3(VIDEO_TIME_XPOS), PG_Y2(VIDEO_TIME_YPOS), - VIDEO_TIME_XPOS, VIDEO_TIME_YPOS, - VIDEO_TIME_XSIZE, VIDEO_TIME_YSIZE - } - }, - { - { - PG_X6(VIDEO_FFWD_LABEL_XPOS), PG_Y1(VIDEO_FFWD_LABEL_YPOS), - PG_X3(VIDEO_LABEL_XPOS), PG_Y2(VIDEO_LABEL_YPOS), - VIDEO_LABEL_XPOS, VIDEO_LABEL_YPOS, - VIDEO_LABEL_XSIZE, VIDEO_LABEL_YSIZE - }, - { - PG_X6(VIDEO_FFWD_SYMBOL_XPOS), PG_Y1(VIDEO_FFWD_SYMBOL_YPOS), - PG_X3(VIDEO_FFWD_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), - VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, - VIDEO_FFWD_SYMBOL_XSIZE, VIDEO_FFWD_SYMBOL_YSIZE - } - }, - { - { - PG_X6(VIDEO_PBEND_LABEL_XPOS), PG_Y1(VIDEO_PBEND_LABEL_YPOS), - PG_X3(VIDEO_LABEL_XPOS), PG_Y2(VIDEO_LABEL_YPOS), - VIDEO_LABEL_XPOS, VIDEO_LABEL_YPOS, - VIDEO_LABEL_XSIZE, VIDEO_LABEL_YSIZE - }, - { - PG_X6(VIDEO_PBEND_SYMBOL_XPOS), PG_Y1(VIDEO_PBEND_SYMBOL_YPOS), - PG_X3(VIDEO_PBEND_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), - VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, - VIDEO_PBEND_SYMBOL_XSIZE, VIDEO_PBEND_SYMBOL_YSIZE - } - }, - { - { - PG_X6(VIDEO_WARP_LABEL_XPOS), PG_Y1(VIDEO_WARP_LABEL_YPOS), - PG_X3(VIDEO_LABEL_XPOS), PG_Y2(VIDEO_LABEL_YPOS), - VIDEO_LABEL_XPOS, VIDEO_LABEL_YPOS, - VIDEO_LABEL_XSIZE, VIDEO_LABEL_YSIZE - }, - { - PG_X6(VIDEO_WARP_SYMBOL_XPOS), PG_Y1(VIDEO_WARP_SYMBOL_YPOS), - PG_X3(VIDEO_WARP_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), - VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, - VIDEO_WARP_SYMBOL_XSIZE, VIDEO_WARP_SYMBOL_YSIZE - } - }, - { - { - -1, -1, - -1, -1, - -1, -1, - -1, -1 - }, - { - PG_X6(VIDEO_WARP2_SYMBOL_XPOS), PG_Y1(VIDEO_WARP2_SYMBOL_YPOS), - PG_X3(VIDEO_WARP2_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), - VIDEO_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, - VIDEO_WARP2_SYMBOL_XSIZE, VIDEO_WARP2_SYMBOL_YSIZE - } - }, - { - { - -1, -1, - -1, -1, - -1, -1, - -1, -1 - }, - { - PG_X6(VIDEO_1STEP_SYMBOL_XPOS), PG_Y1(VIDEO_1STEP_SYMBOL_YPOS), - PG_X3(VIDEO_1STEP_SYMBOL_XPOS), PG_Y2(VIDEO_SYMBOL_YPOS), - VIDEO_1STEP_SYMBOL_XPOS, VIDEO_SYMBOL_YPOS, - VIDEO_1STEP_SYMBOL_XSIZE, VIDEO_1STEP_SYMBOL_YSIZE - } - }, - }; -#endif -#if 1 static struct { int graphic; - struct Rect *pos; + struct XY *pos; } video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] = { @@ -376,6 +219,11 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) { IMG_TAPE_LABEL_GFX_TIME, &tape.label.time }, { -1, NULL }, }, + { + /* (no label for displaying optional frame) */ + { -1, NULL }, + { -1, NULL }, + }, { { IMG_TAPE_LABEL_GFX_FAST_FORWARD, &tape.label.fast_forward }, { IMG_TAPE_SYMBOL_GFX_FAST_FORWARD, &tape.symbol.fast_forward }, @@ -404,28 +252,18 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) { for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++) /* label or symbol */ { - if (video_pos[i][j].graphic == -1 || - video_pos[i][j].pos->x < 0 || - video_pos[i][j].pos->y < 0) - continue; + int graphic = video_pos[i][j].graphic; + struct XY *pos = video_pos[i][j].pos; -#if 0 - printf("::: %d: %d, %ld\n", - i, - video_pos[i][j].graphic, - graphic_info[video_pos[i][j].graphic].bitmap); -#endif - -#if 0 - if (i < 9) + if (graphic == -1 || + pos->x == -1 || + pos->y == -1) continue; -#endif if (state & (1 << (i * 2 + k))) { struct GraphicInfo *gfx_bg = &graphic_info[IMG_BACKGROUND_TAPE]; - struct GraphicInfo *gfx = &graphic_info[video_pos[i][j].graphic]; - struct Rect *pos = video_pos[i][j].pos; + struct GraphicInfo *gfx = &graphic_info[graphic]; Bitmap *gd_bitmap; int gd_x, gd_y; int skip_value = @@ -447,146 +285,176 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) gd_y = gfx_bg->src_y + pos->y; } -#if 0 - printf("::: %d (%d): %d, %ld - %d [%d] [%d] [%d]\n", - i, k, - video_pos[i][j].graphic, - graphic_info[video_pos[i][j].graphic].bitmap, - gfx->bitmap, - gd_bitmap, - (gd_bitmap == NULL), - 0); - - if (gd_bitmap == NULL) - printf("::: gfx %d skipped\n", video_pos[i][j].graphic); -#endif - /* some tape graphics may be undefined -- only draw if defined */ if (gd_bitmap != NULL) BlitBitmap(gd_bitmap, drawto, gd_x, gd_y, gfx->width, gfx->height, VX + pos->x, VY + pos->y); + + redraw_mask |= REDRAW_DOOR_2; } } } } +} -#else - for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++) /* on or off states */ - { - for (i = 0; i < NUM_TAPE_FUNCTIONS; i++) /* record, play, ... */ - { - for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++) /* label or symbol */ - { - if (state & (1 << (i * 2 + k))) - { - int gd_x, gd_y; - int skip_value = - (j == 0 ? VIDEO_DISPLAY_SYMBOL_ONLY : VIDEO_DISPLAY_LABEL_ONLY); +#define DATETIME_NONE (0) - if (k == 1) /* on */ - { - gd_x = video_pos[i][j].gd_x1; - gd_y = video_pos[i][j].gd_y1; - } - else /* off */ - { - gd_x = video_pos[i][j].gd_x2; - gd_y = video_pos[i][j].gd_y2; - } +#define DATETIME_DATE_YYYY (1 << 0) +#define DATETIME_DATE_YY (1 << 1) +#define DATETIME_DATE_MON (1 << 2) +#define DATETIME_DATE_MM (1 << 3) +#define DATETIME_DATE_DD (1 << 4) - if (video_pos[i][j].x != -1 && value != skip_value) - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - gd_x, gd_y, - video_pos[i][j].width, - video_pos[i][j].height, - VX + video_pos[i][j].x, - VY + video_pos[i][j].y); - } - } - } - } -#endif +#define DATETIME_TIME_HH (1 << 5) +#define DATETIME_TIME_MIN (1 << 6) +#define DATETIME_TIME_MM (1 << 7) +#define DATETIME_TIME_SS (1 << 8) -#if 1 - if (state & VIDEO_STATE_DATE_ON) - { - struct TextPosInfo *pos = &tape.text.date; - int tag = value % 100; - int monat = (value/100) % 100; - int jahr = (value/10000); - - DrawText(VX + pos->x, VY + pos->y, int2str(tag, 2), pos->font); - DrawText(VX + pos->x + 27, VY + pos->y, monatsname[monat], pos->font); - DrawText(VX + pos->x + 64, VY + pos->y, int2str(jahr, 2), pos->font); - } +#define DATETIME_FRAME (1 << 9) - if (state & VIDEO_STATE_TIME_ON) - { - struct TextPosInfo *pos = &tape.text.time; - int min = value / 60; - int sec = value % 60; +#define DATETIME_XOFFSET_1 (1 << 10) +#define DATETIME_XOFFSET_2 (1 << 11) - DrawText(VX + pos->x, VY + pos->y, int2str(min, 2), pos->font); - DrawText(VX + pos->x + 27, VY + pos->y, int2str(sec, 2), pos->font); - } +#define DATETIME_DATE (DATETIME_DATE_YYYY | \ + DATETIME_DATE_YY | \ + DATETIME_DATE_MON | \ + DATETIME_DATE_MM | \ + DATETIME_DATE_DD) + +#define DATETIME_TIME (DATETIME_TIME_HH | \ + DATETIME_TIME_MIN | \ + DATETIME_TIME_MM | \ + DATETIME_TIME_SS) + +#define MAX_DATETIME_STRING_SIZE 32 -#else +static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value) +{ + int i; + + static char *month_shortnames[] = + { + "JAN", + "FEB", + "MAR", + "APR", + "MAY", + "JUN", + "JUL", + "AUG", + "SEP", + "OCT", + "NOV", + "DEC" + }; - if (state & VIDEO_STATE_DATE_ON) + static struct { - int tag = value % 100; - int monat = (value/100) % 100; - int jahr = (value/10000); - - DrawText(VX + VIDEO_DATE_XPOS, VY + VIDEO_DATE_YPOS, - int2str(tag, 2), FONT_TAPE_RECORDER); - DrawText(VX + VIDEO_DATE_XPOS + 27, VY + VIDEO_DATE_YPOS, - monatsname[monat], FONT_TAPE_RECORDER); - DrawText(VX + VIDEO_DATE_XPOS + 64, VY + VIDEO_DATE_YPOS, - int2str(jahr, 2), FONT_TAPE_RECORDER); + struct TextPosInfo *pos; + int type; } + datetime_info[] = + { + { &tape.text.date, DATETIME_DATE_DD }, + { &tape.text.date, DATETIME_DATE_MON | DATETIME_XOFFSET_1 }, + { &tape.text.date, DATETIME_DATE_YY | DATETIME_XOFFSET_2 }, + { &tape.text.date_yyyy, DATETIME_DATE_YYYY }, + { &tape.text.date_yy, DATETIME_DATE_YY }, + { &tape.text.date_mon, DATETIME_DATE_MON }, + { &tape.text.date_mm, DATETIME_DATE_MM }, + { &tape.text.date_dd, DATETIME_DATE_DD }, + + { &tape.text.time, DATETIME_TIME_MIN }, + { &tape.text.time, DATETIME_TIME_SS | DATETIME_XOFFSET_1 }, + { &tape.text.time_hh, DATETIME_TIME_HH }, + { &tape.text.time_mm, DATETIME_TIME_MM }, + { &tape.text.time_ss, DATETIME_TIME_SS }, + + { &tape.text.frame, DATETIME_FRAME }, + + { NULL, DATETIME_NONE }, + }; - if (state & VIDEO_STATE_TIME_ON) + for (i = 0; datetime_info[i].pos != NULL; i++) { - int min = value / 60; - int sec = value % 60; + struct TextPosInfo *pos = datetime_info[i].pos; + int type = datetime_info[i].type; + int xpos, ypos; + + if (pos->x == -1 && + pos->y == -1) + continue; + + xpos = VX + pos->x + (type & DATETIME_XOFFSET_1 ? pos->xoffset : + type & DATETIME_XOFFSET_2 ? pos->xoffset2 : 0); + ypos = VY + pos->y; - DrawText(VX + VIDEO_TIME_XPOS, VY + VIDEO_TIME_YPOS, - int2str(min, 2), FONT_TAPE_RECORDER); - DrawText(VX + VIDEO_TIME_XPOS + 27, VY + VIDEO_TIME_YPOS, - int2str(sec, 2), FONT_TAPE_RECORDER); + if ((type & DATETIME_DATE) && (state & VIDEO_STATE_DATE_ON)) + { + char s[MAX_DATETIME_STRING_SIZE]; + int year2 = value / 10000; + int year4 = (year2 < 70 ? 2000 + year2 : 1900 + year2); + int month_index = (value / 100) % 100; + int month = month_index + 1; + int day = value % 100; + + strcpy(s, (type & DATETIME_DATE_YYYY ? int2str(year4, 4) : + type & DATETIME_DATE_YY ? int2str(year2, 2) : + type & DATETIME_DATE_MON ? month_shortnames[month_index] : + type & DATETIME_DATE_MM ? int2str(month, 2) : + type & DATETIME_DATE_DD ? int2str(day, 2) : "")); + + DrawText(xpos, ypos, s, pos->font); + } + else if ((type & DATETIME_TIME) && (state & VIDEO_STATE_TIME_ON)) + { + char s[MAX_DATETIME_STRING_SIZE]; + int hh = (value / 3600) % 100; + int min = value / 60; + int mm = (value / 60) % 60; + int ss = value % 60; + + strcpy(s, (type & DATETIME_TIME_HH ? int2str(hh, 2) : + type & DATETIME_TIME_MIN ? int2str(min, 2) : + type & DATETIME_TIME_MM ? int2str(mm, 2) : + type & DATETIME_TIME_SS ? int2str(ss, 2) : "")); + + DrawText(xpos, ypos, s, pos->font); + } + else if ((type & DATETIME_FRAME) && (state & VIDEO_STATE_FRAME_ON)) + { + DrawText(xpos, ypos, int2str(value, pos->size), pos->font); + } } -#endif +} - redraw_mask |= REDRAW_DOOR_2; +void DrawVideoDisplay(unsigned int state, unsigned int value) +{ + DrawVideoDisplay_Graphics(state, value); + DrawVideoDisplay_DateTime(state, value); } 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 + struct GraphicInfo *g_tape = &graphic_info[IMG_BACKGROUND_TAPE]; - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - DOOR_GFX_PAGEX3, DOOR_GFX_PAGEY2, + /* draw tape background */ + BlitBitmap(g_tape->bitmap, drawto, g_tape->src_x, g_tape->src_y, gfx.vxsize, gfx.vysize, gfx.vx, gfx.vy); - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - DOOR_GFX_PAGEX4 + VIDEO_CONTROL_XPOS, - DOOR_GFX_PAGEY2 + VIDEO_CONTROL_YPOS, - VIDEO_CONTROL_XSIZE, VIDEO_CONTROL_YSIZE, - gfx.vx + VIDEO_CONTROL_XPOS, gfx.vy + VIDEO_CONTROL_YPOS); + + /* draw tape buttons (forced) */ + UnmapTapeButtons(); + MapTapeButtons(); 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); + DrawVideoDisplay(VIDEO_STATE_FRAME_ON, tape.length_frames); if (tape.pausing) DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0); @@ -596,6 +464,7 @@ void DrawCompleteVideoDisplay() DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); + DrawVideoDisplay(VIDEO_STATE_FRAME_ON, 0); if (tape.pausing) DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, 0); @@ -604,17 +473,11 @@ void DrawCompleteVideoDisplay() { DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds); + DrawVideoDisplay(VIDEO_STATE_FRAME_ON, tape.length_frames); } -#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); + BlitBitmap(drawto, bitmap_db_door_2, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize, + 0, 0); } void TapeDeactivateDisplayOn() @@ -630,7 +493,7 @@ void TapeDeactivateDisplayOff(boolean redraw_display) if (redraw_display) { - RedrawPlayfield(TRUE, 0,0,0,0); + RedrawPlayfield(); DrawGameDoorValues(); } } @@ -658,6 +521,7 @@ void TapeErase() tape.counter = 0; tape.length = 0; + tape.length_frames = 0; tape.length_seconds = 0; if (leveldir_current) @@ -703,12 +567,12 @@ static void TapeRewind() InitRND(tape.random_seed); } -static void TapeSetRandomSeed(long random_seed) +static void TapeSetRandomSeed(int random_seed) { tape.random_seed = InitRND(random_seed); } -void TapeStartRecording(long random_seed) +void TapeStartRecording(int random_seed) { if (!TAPE_IS_STOPPED(tape)) TapeStop(); @@ -722,6 +586,7 @@ void TapeStartRecording(long random_seed) DrawVideoDisplay(VIDEO_STATE_REC_ON, 0); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); + DrawVideoDisplay(VIDEO_STATE_FRAME_ON, 0); MapTapeWarpButton(); @@ -760,9 +625,7 @@ 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() @@ -774,7 +637,8 @@ void TapeHaltRecording() tape.pos[tape.counter].delay = 0; tape.length = tape.counter; - tape.length_seconds = GetTapeLength(); + tape.length_frames = GetTapeLengthFrames(); + tape.length_seconds = GetTapeLengthSeconds(); } void TapeStopRecording() @@ -875,10 +739,23 @@ void TapeTogglePause(boolean toggle_manual) TapeAppendRecording(); - if (!CheckEngineSnapshot()) - SaveEngineSnapshot(); + if (!CheckEngineSnapshotSingle()) + SaveEngineSnapshotSingle(); + + // restart step/move snapshots after quick loading tape + SaveEngineSnapshotToListInitial(); } } + + if (setup.show_snapshot_buttons && + game_status == GAME_MODE_PLAYING && + CheckEngineSnapshotList()) + { + if (tape.pausing) + MapUndoRedoButtons(); + else if (!tape.single_step) + UnmapUndoRedoButtons(); + } } void TapeStartPlaying() @@ -896,6 +773,7 @@ void TapeStartPlaying() DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0); DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0); + DrawVideoDisplay(VIDEO_STATE_FRAME_ON, 0); MapTapeWarpButton(); @@ -997,6 +875,13 @@ byte *TapePlayAction() for (i = 0; i < MAX_PLAYERS; i++) action[i] = tape.pos[tape.counter].action[i]; +#if DEBUG_TAPE_WHEN_PLAYING + printf("%05d", FrameCounter); + for (i = 0; i < MAX_PLAYERS; i++) + printf(" %08x", action[i]); + printf("\n"); +#endif + tape.set_centered_player = FALSE; tape.centered_player_nr_next = -999; @@ -1033,21 +918,27 @@ void TapeStop() { DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date); DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds); + DrawVideoDisplay(VIDEO_STATE_FRAME_ON, tape.length_frames); } } -unsigned int GetTapeLength() +unsigned int GetTapeLengthFrames() { - unsigned int tape_length = 0; + unsigned int tape_length_frames = 0; int i; if (TAPE_IS_EMPTY(tape)) return(0); for (i = 0; i < tape.length; i++) - tape_length += tape.pos[i].delay; + tape_length_frames += tape.pos[i].delay; - return(tape_length * GAME_FRAME_DELAY / 1000); + return tape_length_frames; +} + +unsigned int GetTapeLengthSeconds() +{ + return (GetTapeLengthFrames() * GAME_FRAME_DELAY / 1000); } static void TapeStartWarpForward() @@ -1105,7 +996,7 @@ void TapeQuickSave() { if (game_status == GAME_MODE_MAIN) { - Request("No game that can be saved !", REQ_CONFIRM); + Request("No game that can be saved!", REQ_CONFIRM); return; } @@ -1118,13 +1009,13 @@ void TapeQuickSave() if (TAPE_IS_EMPTY(tape)) { - Request("No tape that can be saved !", REQ_CONFIRM); + Request("No tape that can be saved!", REQ_CONFIRM); return; } if (SaveTapeChecked(tape.level_nr)) - SaveEngineSnapshot(); + SaveEngineSnapshotSingle(); } void TapeQuickLoad() @@ -1133,12 +1024,12 @@ void TapeQuickLoad() if (!fileExists(filename)) { - Request("No tape for this level !", REQ_CONFIRM); + Request("No tape for this level!", REQ_CONFIRM); return; } - if (tape.recording && !Request("Stop recording and load tape ?", + if (tape.recording && !Request("Stop recording and load tape?", REQ_ASK | REQ_STAY_CLOSED)) { OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); @@ -1149,11 +1040,11 @@ void TapeQuickLoad() if (game_status != GAME_MODE_PLAYING && game_status != GAME_MODE_MAIN) return; - if (CheckEngineSnapshot()) + if (CheckEngineSnapshotSingle()) { TapeStartGamePlaying(); - LoadEngineSnapshot(); + LoadEngineSnapshotSingle(); DrawCompleteVideoDisplay(); @@ -1163,6 +1054,9 @@ void TapeQuickLoad() TapeStopWarpForward(); TapeAppendRecording(); + // restart step/move snapshots after quick loading tape + SaveEngineSnapshotToListInitial(); + if (FrameCounter > 0) return; } @@ -1183,7 +1077,7 @@ void TapeQuickLoad() { int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0); - Request("No tape for this level !", REQ_CONFIRM | reopen_door); + Request("No tape for this level!", REQ_CONFIRM | reopen_door); } } @@ -1195,7 +1089,7 @@ void InsertSolutionTape() LoadSolutionTape(level_nr); if (TAPE_IS_EMPTY(tape)) - Request("No solution tape for this level !", REQ_CONFIRM); + Request("No solution tape for this level!", REQ_CONFIRM); DrawCompleteVideoDisplay(); } @@ -1214,7 +1108,6 @@ void AutoPlayTape() static int num_levels_solved = 0; static int num_tape_missing = 0; static boolean level_failed[MAX_TAPES_PER_SET]; - static boolean tape_missing[MAX_TAPES_PER_SET]; int i; if (autoplay_initialized) @@ -1232,7 +1125,9 @@ void AutoPlayTape() else { DrawCompleteVideoDisplay(); + audio.sound_enabled = FALSE; + setup.engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_OFF); autoplay_leveldir = getTreeInfoFromIdentifier(leveldir_first, global.autoplay_leveldir); @@ -1261,10 +1156,7 @@ void AutoPlayTape() printf("\n"); for (i = 0; i < MAX_TAPES_PER_SET; i++) - { level_failed[i] = FALSE; - tape_missing[i] = FALSE; - } autoplay_initialized = TRUE; } @@ -1298,17 +1190,21 @@ void AutoPlayTape() if (tape.no_valid_file) { num_tape_missing++; - if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET) - tape_missing[level_nr] = TRUE; printf("(no tape)\n"); + continue; } printf("playing tape ... "); TapeStartGamePlaying(); - TapeStartWarpForward(); + + if (global.autoplay_mode == AUTOPLAY_FFWD) + tape.fast_forward = TRUE; + + if (global.autoplay_mode != AUTOPLAY_PLAY) + TapeStartWarpForward(); return; } @@ -1332,16 +1228,6 @@ void AutoPlayTape() printf(" %03d", i); } -#if 0 - if (num_tape_missing > 0) - { - printf(", NO TAPE:"); - for (i = 0; i < MAX_TAPES_PER_SET; i++) - if (tape_missing[i]) - printf(" %03d", i); - } -#endif - printf("\n"); printf_line("=", 79); @@ -1354,7 +1240,7 @@ void AutoPlayTape() static struct { int graphic; - struct Rect *pos; + struct XY *pos; int gadget_id; char *infotext; } tapebutton_info[NUM_TAPE_BUTTONS] = @@ -1393,7 +1279,7 @@ void CreateTapeButtons() for (i = 0; i < NUM_TAPE_BUTTONS; i++) { struct GraphicInfo *gfx = &graphic_info[tapebutton_info[i].graphic]; - struct Rect *pos = tapebutton_info[i].pos; + struct XY *pos = tapebutton_info[i].pos; struct GadgetInfo *gi; int gd_x = gfx->src_x; int gd_y = gfx->src_y; @@ -1453,6 +1339,9 @@ void MapTapeButtons() if (tape.recording || tape.playing) MapTapeWarpButton(); + + if (tape.show_game_buttons) + MapGameButtons(); } void UnmapTapeButtons() @@ -1461,6 +1350,9 @@ void UnmapTapeButtons() for (i = 0; i < NUM_TAPE_BUTTONS; i++) UnmapGadget(tape_gadget[i]); + + if (tape.show_game_buttons) + UnmapGameButtons(); } static void HandleTapeButtonsExt(int id) @@ -1478,7 +1370,7 @@ static void HandleTapeButtonsExt(int id) LoadTape(level_nr); if (TAPE_IS_EMPTY(tape)) - Request("No tape for this level !", REQ_CONFIRM); + Request("No tape for this level!", REQ_CONFIRM); } else { @@ -1529,6 +1421,13 @@ static void HandleTapeButtonsExt(int id) break; case TAPE_CTRL_ID_PLAY: + if (tape.recording && tape.pausing) /* PAUSE -> RECORD */ + { + // ("TAPE_IS_EMPTY(tape)" is TRUE here -- probably fix this) + + TapeTogglePause(TAPE_TOGGLE_MANUAL); + } + if (TAPE_IS_EMPTY(tape)) break;