X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftape.c;h=44bbc57bcbe440274f30575c61e5f462207c19ce;hb=efd0d0abb853018aa3ccc3c727b39bd7f5ba679d;hp=7add692b51d605ad0bd07b50b8a276f09e89e6a4;hpb=49221e59bff18cdfbef8c877b588280266ae5037;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 7add692b..44bbc57b 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -1,14 +1,14 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2001 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  tape.c                                                  *
+* tape.c                                                   *
 ***********************************************************/
 
 #include "libgame/libgame.h"
@@ -18,6 +18,7 @@
 #include "tools.h"
 #include "files.h"
 #include "network.h"
+#include "cartoons.h"
 
 /* tape button identifiers */
 #define TAPE_CTRL_ID_EJECT		0
@@ -77,7 +78,7 @@ static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
 #define VIDEO_TIME_YSIZE	16
 
 /* special */
-#define VIDEO_PBEND_LABEL_XPOS	6
+#define VIDEO_PBEND_LABEL_XPOS	5
 #define VIDEO_PBEND_LABEL_YPOS	220
 #define VIDEO_PBEND_LABEL_XSIZE	35
 #define VIDEO_PBEND_LABEL_YSIZE	30
@@ -315,13 +316,17 @@ void TapeStartRecording()
 
 void TapeStopRecording()
 {
+#if 0
   int i;
+#endif
 
   if (!tape.recording)
     return;
 
+#if 0
   for(i=0; i<MAX_PLAYERS; i++)
     tape.pos[tape.counter].action[i] = 0;
+#endif
 
   tape.counter++;
   tape.length = tape.counter;
@@ -331,6 +336,7 @@ void TapeStopRecording()
   DrawVideoDisplay(VIDEO_STATE_REC_OFF, 0);
 }
 
+#if 0
 void TapeRecordAction(byte joy[MAX_PLAYERS])
 {
   int i;
@@ -351,6 +357,49 @@ void TapeRecordAction(byte joy[MAX_PLAYERS])
   tape.pos[tape.counter].delay = 0;
 }
 
+#else
+
+void TapeRecordAction(byte action[MAX_PLAYERS])
+{
+  int i;
+
+  if (!tape.recording || tape.pausing)
+    return;
+
+  if (tape.counter >= MAX_TAPELEN-1)
+  {
+    TapeStopRecording();
+    return;
+  }
+
+  if (tape.pos[tape.counter].delay > 0)		/* already stored action */
+  {
+    boolean changed_events = FALSE;
+
+    for(i=0; i<MAX_PLAYERS; i++)
+      if (tape.pos[tape.counter].action[i] != action[i])
+	changed_events = TRUE;
+
+    if (changed_events || tape.pos[tape.counter].delay >= 255)
+    {
+      tape.counter++;
+      tape.pos[tape.counter].delay = 0;
+    }
+    else
+      tape.pos[tape.counter].delay++;
+  }
+
+  if (tape.pos[tape.counter].delay == 0)	/* store new action */
+  {
+    for(i=0; i<MAX_PLAYERS; i++)
+      tape.pos[tape.counter].action[i] = action[i];
+
+    tape.pos[tape.counter].delay++;
+  }
+}
+#endif
+
+#if 0
 void TapeRecordDelay()
 {
   int i;
@@ -376,6 +425,13 @@ void TapeRecordDelay()
   }
 }
 
+#else
+
+void TapeRecordDelay()
+{
+}
+#endif
+
 void TapeTogglePause()
 {
   unsigned long state;
@@ -426,6 +482,7 @@ void TapeStopPlaying()
   DrawVideoDisplay(VIDEO_STATE_PLAY_OFF, 0);
 }
 
+#if 0
 byte *TapePlayAction()
 {
   static byte joy[MAX_PLAYERS];
@@ -457,6 +514,54 @@ byte *TapePlayAction()
   return(joy);
 }
 
+#else
+
+byte *TapePlayAction()
+{
+  static byte action[MAX_PLAYERS];
+  int i;
+
+  if (!tape.playing || tape.pausing)
+    return NULL;
+
+  if (tape.pause_before_death)	/* STOP 10s BEFORE PLAYER GETS KILLED... */
+  {
+    if (!(FrameCounter % 20))
+    {
+      if ((FrameCounter / 20) % 2)
+	DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
+      else
+	DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+    }
+
+    if (TimePlayed > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
+    {
+      TapeTogglePause();
+      return NULL;
+    }
+  }
+
+  if (tape.counter >= tape.length)
+  {
+    TapeStop();
+    return NULL;
+  }
+
+  for(i=0; i<MAX_PLAYERS; i++)
+    action[i] = tape.pos[tape.counter].action[i];
+
+  tape.delay_played++;
+  if (tape.delay_played >= tape.pos[tape.counter].delay)
+  {
+    tape.counter++;
+    tape.delay_played = 0;
+  }
+
+  return action;
+}
+#endif
+
+#if 0
 boolean TapePlayDelay()
 {
   if (!tape.playing || tape.pausing)
@@ -494,6 +599,14 @@ boolean TapePlayDelay()
     return(FALSE);
 }
 
+#else
+
+boolean TapePlayDelay()
+{
+  return TRUE|FALSE;	/* ...it doesn't matter at all */
+}
+#endif
+
 void TapeStop()
 {
   TapeStopRecording();
@@ -580,7 +693,7 @@ void CreateTapeButtons()
 
   for (i=0; i<NUM_TAPE_BUTTONS; i++)
   {
-    Bitmap gd_bitmap = pix[PIX_DOOR];
+    Bitmap *gd_bitmap = pix[PIX_DOOR];
     struct GadgetInfo *gi;
     int gd_xoffset, gd_yoffset;
     int gd_x1, gd_x2, gd_y;
@@ -675,6 +788,7 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 #endif
 	{
 	  game_status = PLAYING;
+	  StopAnimation();
 	  InitGame();
 	}
       }
@@ -703,6 +817,7 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 	TapeStartPlaying();
 
 	game_status = PLAYING;
+	StopAnimation();
 	InitGame();
       }
       else if (tape.playing)