X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=3aa2282b2edd6b1c0b5d67139f73b7757511ee15;hb=34ca525d659f14cec647449f4be8ee009a5bc267;hp=43c97f5ce7d2938175ddf1aad4e858e1e8f75762;hpb=91afd13180ad610e2a6cbef32b85677cf8148864;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 43c97f5c..3aa2282b 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -50,7 +50,7 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 #define VIDEO_DATE_LABEL_YPOS	(VIDEO_DISPLAY1_YPOS)
 #define VIDEO_DATE_LABEL_XSIZE	(VIDEO_DISPLAY_XSIZE)
 #define VIDEO_DATE_LABEL_YSIZE	(VIDEO_DISPLAY_YSIZE)
-#define VIDEO_DATE_XPOS		(VIDEO_DISPLAY1_XPOS + 1)
+#define VIDEO_DATE_XPOS		(VIDEO_DISPLAY1_XPOS + 2)
 #define VIDEO_DATE_YPOS		(VIDEO_DISPLAY1_YPOS + 14)
 #define VIDEO_DATE_XSIZE	(VIDEO_DISPLAY_XSIZE)
 #define VIDEO_DATE_YSIZE	16
@@ -78,7 +78,7 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 #define VIDEO_PAUSE_SYMBOL_YPOS	(VIDEO_DISPLAY2_YPOS)
 #define VIDEO_PAUSE_SYMBOL_XSIZE 17
 #define VIDEO_PAUSE_SYMBOL_YSIZE 13
-#define VIDEO_TIME_XPOS		(VIDEO_DISPLAY2_XPOS + 38)
+#define VIDEO_TIME_XPOS		(VIDEO_DISPLAY2_XPOS + 39)
 #define VIDEO_TIME_YPOS		(VIDEO_DISPLAY2_YPOS + 14)
 #define VIDEO_TIME_XSIZE	50
 #define VIDEO_TIME_YSIZE	16
@@ -316,6 +316,11 @@ void TapeErase()
   tape.game_version = GAME_VERSION_ACTUAL;
   tape.engine_version = level.game_version;
 
+#if 0
+  printf("::: tape.engine_version = level.game_version = %d \n",
+	 level.game_version);
+#endif
+
   for(i=0; i<MAX_PLAYERS; i++)
     tape.player_participates[i] = FALSE;
 }
@@ -366,7 +371,7 @@ static void TapeStartGameRecording()
   else
 #endif
   {
-    game_status = PLAYING;
+    game_status = GAME_MODE_PLAYING;
     StopAnimation();
     InitGame();
   }
@@ -511,7 +516,7 @@ static void TapeStartGamePlaying()
 {
   TapeStartPlaying();
 
-  game_status = PLAYING;
+  game_status = GAME_MODE_PLAYING;
   StopAnimation();
   InitGame();
 }
@@ -591,8 +596,10 @@ void TapeStop()
     DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
   }
 
+#if 0
   if (tape.auto_play)
     AutoPlayTape();	/* continue automatically playing next tape */
+#endif
 }
 
 unsigned int GetTapeLength()
@@ -646,7 +653,7 @@ static void TapeSingleStep()
 
 void TapeQuickSave()
 {
-  if (game_status == PLAYING)
+  if (game_status == GAME_MODE_PLAYING)
   {
     if (tape.recording)
       TapeHaltRecording();	/* prepare tape for saving on-the-fly */
@@ -656,13 +663,13 @@ void TapeQuickSave()
     else
       SaveTape(tape.level_nr);
   }
-  else if (game_status == MAINMENU)
+  else if (game_status == GAME_MODE_MAIN)
     Request("No game that can be saved !", REQ_CONFIRM);
 }
 
 void TapeQuickLoad()
 {
-  if (game_status == PLAYING || game_status == MAINMENU)
+  if (game_status == GAME_MODE_PLAYING || game_status == GAME_MODE_MAIN)
   {
     TapeStop();
     TapeErase();
@@ -943,7 +950,7 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
 
-  if (game_status != MAINMENU && game_status != PLAYING)
+  if (game_status != GAME_MODE_MAIN && game_status != GAME_MODE_PLAYING)
     return;
 
   switch (id)