X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=2c600226716fcdb2988c5f7381b5dcbeb0116078;hb=4f767d54c7ac468e9a42e22caf716111be1ceba9;hp=53ce1d9ed3cee0a7f654f7b01486526006670071;hpb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 53ce1d9e..2c600226 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -35,9 +35,9 @@ void TapeStartRecording()
   tape.date = 10000*(zeit2->tm_year%100) + 100*zeit2->tm_mon + zeit2->tm_mday;
   tape.random_seed = InitRND(NEW_RANDOMIZE);
 
-  DrawVideoDisplay(VIDEO_STATE_REC_ON,0);
-  DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-  DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
+  DrawVideoDisplay(VIDEO_STATE_REC_ON, 0);
+  DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
+  DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
 }
 
 void TapeStopRecording()
@@ -48,31 +48,31 @@ void TapeStopRecording()
     return;
 
   for(i=0; i<MAX_PLAYERS; i++)
-    tape.pos[tape.counter].joystickdata[i] = 0;
+    tape.pos[tape.counter].action[i] = 0;
 
   tape.counter++;
   tape.length = tape.counter;
   tape.length_seconds = GetTapeLength();
   tape.recording = FALSE;
   tape.pausing = FALSE;
-  DrawVideoDisplay(VIDEO_STATE_REC_OFF,0);
+  DrawVideoDisplay(VIDEO_STATE_REC_OFF, 0);
 }
 
-void TapeRecordAction(int joy[MAX_PLAYERS])
+void TapeRecordAction(byte joy[MAX_PLAYERS])
 {
   int i;
 
   if (!tape.recording || tape.pausing)
     return;
 
-  if (tape.counter>=MAX_TAPELEN-1)
+  if (tape.counter >= MAX_TAPELEN-1)
   {
     TapeStopRecording();
     return;
   }
 
   for(i=0; i<MAX_PLAYERS; i++)
-    tape.pos[tape.counter].joystickdata[i] = joy[i];
+    tape.pos[tape.counter].action[i] = joy[i];
 
   tape.counter++;
   tape.pos[tape.counter].delay = 0;
@@ -85,7 +85,7 @@ void TapeRecordDelay()
   if (!tape.recording || tape.pausing)
     return;
 
-  if (tape.counter>=MAX_TAPELEN)
+  if (tape.counter >= MAX_TAPELEN)
   {
     TapeStopRecording();
     return;
@@ -96,7 +96,7 @@ void TapeRecordDelay()
   if (tape.pos[tape.counter].delay >= 255)
   {
     for(i=0; i<MAX_PLAYERS; i++)
-      tape.pos[tape.counter].joystickdata[i] = 0;
+      tape.pos[tape.counter].action[i] = 0;
 
     tape.counter++;
     tape.pos[tape.counter].delay = 0;
@@ -111,9 +111,10 @@ void TapeTogglePause()
   tape.pausing = !tape.pausing;
   tape.fast_forward = FALSE;
   tape.pause_before_death = FALSE;
-  DrawVideoDisplay(tape.pausing ?
-		   VIDEO_STATE_PAUSE_ON :
-		   VIDEO_STATE_PAUSE_OFF,0);
+  DrawVideoDisplay((tape.pausing ?
+		    VIDEO_STATE_PAUSE_ON :
+		    VIDEO_STATE_PAUSE_OFF) | VIDEO_STATE_PBEND_OFF,
+		   0);
 }
 
 void TapeStartPlaying()
@@ -133,9 +134,9 @@ void TapeStartPlaying()
   tape.fast_forward = FALSE;
   InitRND(tape.random_seed);
 
-  DrawVideoDisplay(VIDEO_STATE_PLAY_ON,0);
-  DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-  DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
+  DrawVideoDisplay(VIDEO_STATE_PLAY_ON, 0);
+  DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
+  DrawVideoDisplay(VIDEO_STATE_TIME_ON, 0);
 }
 
 void TapeStopPlaying()
@@ -145,18 +146,18 @@ void TapeStopPlaying()
 
   tape.playing = FALSE;
   tape.pausing = FALSE;
-  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF,0);
+  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF, 0);
 }
 
-int *TapePlayAction()
+byte *TapePlayAction()
 {
-  static int joy[MAX_PLAYERS];
+  static byte joy[MAX_PLAYERS];
   int i;
 
   if (!tape.playing || tape.pausing)
     return(NULL);
 
-  if (tape.counter>=tape.length)
+  if (tape.counter >= tape.length)
   {
     TapeStop();
     return(NULL);
@@ -168,27 +169,30 @@ int *TapePlayAction()
     tape.counter++;
 
     for(i=0; i<MAX_PLAYERS; i++)
-      joy[i] = tape.pos[tape.counter-1].joystickdata[i];
-
-    return(joy);
+      joy[i] = tape.pos[tape.counter-1].action[i];
+  }
+  else
+  {
+    for(i=0; i<MAX_PLAYERS; i++)
+      joy[i] = 0;
   }
 
-  return(NULL);
+  return(joy);
 }
 
-BOOL TapePlayDelay()
+boolean TapePlayDelay()
 {
   if (!tape.playing || tape.pausing)
     return(FALSE);
 
   if (tape.pause_before_death)	/* STOP 10s BEFORE PLAYER GETS KILLED... */
   {
-    if (!(FrameCounter % 5))
+    if (!(FrameCounter % 20))
     {
-      if (2*(FrameCounter/10) == FrameCounter/5)
-	DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, VIDEO_DISPLAY_LABEL_ONLY);
+      if ((FrameCounter / 20) % 2)
+	DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
       else
-	DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+	DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
     }
 
     if (level.time-TimeLeft > tape.length_seconds - PAUSE_SECONDS_BEFORE_DEATH)
@@ -198,7 +202,7 @@ BOOL TapePlayDelay()
     }
   }
 
-  if (tape.counter>=tape.length)
+  if (tape.counter >= tape.length)
   {
     TapeStop();
     return(TRUE);
@@ -221,8 +225,8 @@ void TapeStop()
   DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
   if (tape.date && tape.length)
   {
-    DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-    DrawVideoDisplay(VIDEO_STATE_TIME_ON,tape.length_seconds);
+    DrawVideoDisplay(VIDEO_STATE_DATE_ON, tape.date);
+    DrawVideoDisplay(VIDEO_STATE_TIME_ON, tape.length_seconds);
   }
 }
 
@@ -242,5 +246,5 @@ unsigned int GetTapeLength()
   for(i=0;i<tape.length;i++)
     tape_length += tape.pos[i].delay;
 
-  return(tape_length * GAME_FRAME_DELAY / 100);
+  return(tape_length * GAME_FRAME_DELAY / 1000);
 }