X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=07f8f82234b23f2a3008e2475ce03a49e058cb25;hp=fb36f1e28806046a69c6b1dfe1a1cfc6c9ff6bec;hb=7ecbe0a730dc19d8a46ffe6bbcb052f20d0c4152;hpb=8770e2b8105f8bb38e5ab4f385e044de16436dea

diff --git a/src/tape.c b/src/tape.c
index fb36f1e2..07f8f822 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -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,19 +188,14 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 /* video display functions                                                   */
 /* ========================================================================= */
 
-void DrawVideoDisplay(unsigned int state, unsigned int 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"
-  };
 
   static struct
   {
     int graphic;
-    struct Rect *pos;
+    struct XY *pos;
   }
   video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] =
   {
@@ -222,6 +219,11 @@ void DrawVideoDisplay(unsigned int state, unsigned int 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 },
@@ -250,16 +252,18 @@ void DrawVideoDisplay(unsigned int state, unsigned int 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)
+	int graphic = video_pos[i][j].graphic;
+	struct XY *pos = video_pos[i][j].pos;
+
+	if (graphic == -1 ||
+	    pos->x == -1 ||
+	    pos->y == -1)
 	  continue;
 
 	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 =
@@ -285,34 +289,150 @@ void DrawVideoDisplay(unsigned int state, unsigned int value)
 	  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;
 	}
       }
     }
   }
+}
+
+
+#define DATETIME_NONE			(0)
+
+#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)
+
+#define DATETIME_TIME_HH		(1 << 5)
+#define DATETIME_TIME_MIN		(1 << 6)
+#define DATETIME_TIME_MM		(1 << 7)
+#define DATETIME_TIME_SS		(1 << 8)
+
+#define DATETIME_FRAME			(1 << 9)
 
-  if (state & VIDEO_STATE_DATE_ON)
+#define DATETIME_XOFFSET_1		(1 << 10)
+#define DATETIME_XOFFSET_2		(1 << 11)
+
+#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
+
+static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
+{
+  int i;
+
+  static char *month_shortnames[] =
   {
-    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);
+    "JAN",
+    "FEB",
+    "MAR",
+    "APR",
+    "MAY",
+    "JUN",
+    "JUL",
+    "AUG",
+    "SEP",
+    "OCT",
+    "NOV",
+    "DEC"
+  };
+
+  static struct
+  {
+    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++)
   {
-    struct TextPosInfo *pos = &tape.text.time;
-    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;
 
-    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);
+    xpos = VX + pos->x + (type & DATETIME_XOFFSET_1 ? pos->xoffset  :
+			  type & DATETIME_XOFFSET_2 ? pos->xoffset2 : 0);
+    ypos = VY + pos->y;
+
+    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);
+    }
   }
+}
 
-  redraw_mask |= REDRAW_DOOR_2;
+void DrawVideoDisplay(unsigned int state, unsigned int value)
+{
+  DrawVideoDisplay_Graphics(state, value);
+  DrawVideoDisplay_DateTime(state, value);
 }
 
 void DrawCompleteVideoDisplay()
@@ -334,6 +454,7 @@ void DrawCompleteVideoDisplay()
     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);
@@ -343,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);
@@ -351,6 +473,7 @@ 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);
   }
 
   BlitBitmap(drawto, bitmap_db_door_2, gfx.vx, gfx.vy, gfx.vxsize, gfx.vysize,
@@ -370,7 +493,7 @@ void TapeDeactivateDisplayOff(boolean redraw_display)
 
   if (redraw_display)
   {
-    RedrawPlayfield(TRUE, 0,0,0,0);
+    RedrawPlayfield();
     DrawGameDoorValues();
   }
 }
@@ -398,6 +521,7 @@ void TapeErase()
 
   tape.counter = 0;
   tape.length = 0;
+  tape.length_frames = 0;
   tape.length_seconds = 0;
 
   if (leveldir_current)
@@ -462,6 +586,7 @@ void TapeStartRecording(int 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();
 
@@ -512,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()
@@ -613,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()
@@ -634,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();
 
@@ -778,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()
@@ -869,7 +1015,7 @@ void TapeQuickSave()
   }
 
   if (SaveTapeChecked(tape.level_nr))
-    SaveEngineSnapshot();
+    SaveEngineSnapshotSingle();
 }
 
 void TapeQuickLoad()
@@ -894,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();
 
@@ -908,6 +1054,9 @@ void TapeQuickLoad()
     TapeStopWarpForward();
     TapeAppendRecording();
 
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
+
     if (FrameCounter > 0)
       return;
   }
@@ -976,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);
@@ -1048,7 +1199,12 @@ void AutoPlayTape()
     printf("playing tape ... ");
 
     TapeStartGamePlaying();
-    TapeStartWarpForward();
+
+    if (global.autoplay_mode == AUTOPLAY_FFWD)
+      tape.fast_forward = TRUE;
+
+    if (global.autoplay_mode != AUTOPLAY_PLAY)
+      TapeStartWarpForward();
 
     return;
   }
@@ -1084,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] =
@@ -1123,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;
@@ -1194,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)
@@ -1262,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;