rnd-20020401-1-src

diff --git a/src/events.c b/src/events.c
index 4bf6da2d2ece4046f314267a48ae0d589eadee8a..c497116ed6adb55b420a9718af18abd0be2e9820 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -486,6 +486,14 @@ void HandleKey(Key key, int key_status)
     return;
   }
 
+  /* special shortcuts for quick game tape saving and loading */
+  if (game_status == MAINMENU || game_status == PLAYING)
+  {
+    if (key == KSYM_F1)                /* save game */
+      TapeQuickSave();
+    else if (key == KSYM_F2)   /* load game */
+      TapeQuickLoad();
+  }
 
 
 #ifndef DEBUG

diff --git a/src/main.h b/src/main.h
index c2c9346cc3ce9135726dc1b2f34ee692be97e9ef..42eeba637cf089862a856f9a57e48432252fde74 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -303,9 +303,11 @@ struct TapeInfo
   boolean recording, playing, pausing;
   boolean fast_forward;
   boolean index_search;
+  boolean quick_resume;
   boolean changed;
   boolean player_participates[MAX_PLAYERS];
   int num_participating_players;
+
   struct
   {
     byte action[MAX_PLAYERS];

diff --git a/src/tape.c b/src/tape.c
index 963426033e02a9bb58a0013533e58364ff239137..db15dde94b1e7c1307af7f0c136396472395e627 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -322,7 +322,42 @@ void TapeStartRecording()
   SetDrawDeactivationMask(REDRAW_NONE);
 }
 
-void TapeStopRecording()
+static void TapeStartGameRecording()
+{
+  TapeStartRecording();
+
+#if defined(PLATFORM_UNIX)
+  if (options.network)
+    SendToServer_StartPlaying();
+  else
+#endif
+  {
+    game_status = PLAYING;
+    StopAnimation();
+    InitGame();
+  }
+}
+
+static void TapeAppendRecording()
+{
+  if (!tape.playing || !tape.pausing)
+    return;
+
+  if (tape.game_version != GAME_VERSION_ACTUAL &&
+      !Request("This may break old version tape ! Append anyway ?",
+              REQ_ASK))
+    return;
+
+  tape.pos[tape.counter].delay = tape.delay_played;
+  tape.playing = FALSE;
+  tape.recording = TRUE;
+  tape.changed = TRUE;
+  tape.game_version = GAME_VERSION_ACTUAL;
+
+  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
+}
+
+void TapeHaltRecording()
 {
   if (!tape.recording)
     return;
@@ -330,6 +365,15 @@ void TapeStopRecording()
   tape.counter++;
   tape.length = tape.counter;
   tape.length_seconds = GetTapeLength();
+}
+
+void TapeStopRecording()
+{
+  if (!tape.recording)
+    return;
+
+  TapeHaltRecording();
+
   tape.recording = FALSE;
   tape.pausing = FALSE;
 
@@ -344,7 +388,7 @@ void TapeRecordAction(byte action[MAX_PLAYERS])
   if (!tape.recording || tape.pausing)
     return;
 
-  if (tape.counter >= MAX_TAPELEN-1)
+  if (tape.counter >= MAX_TAPELEN - 1)
   {
     TapeStopRecording();
     return;
@@ -405,6 +449,14 @@ void TapeTogglePause()
 
     SetDrawDeactivationMask(REDRAW_NONE);
     RedrawPlayfield(TRUE, 0,0,0,0);
+
+    if (tape.quick_resume)
+    {
+      tape.quick_resume = FALSE;
+
+      TapeAppendRecording();
+      TapeTogglePause();
+    }
   }
 }
 
@@ -424,6 +476,7 @@ void TapeStartPlaying()
   tape.pausing = FALSE;
   tape.fast_forward = FALSE;
   tape.index_search = FALSE;
+  tape.quick_resume = FALSE;
 
   InitRND(tape.random_seed);
 
@@ -435,6 +488,15 @@ void TapeStartPlaying()
   SetDrawDeactivationMask(REDRAW_NONE);
 }
 
+static void TapeStartGamePlaying()
+{
+  TapeStartPlaying();
+
+  game_status = PLAYING;
+  StopAnimation();
+  InitGame();
+}
+
 void TapeStopPlaying()
 {
   if (!tape.playing)
@@ -527,6 +589,51 @@ unsigned int GetTapeLength()
   return(tape_length * GAME_FRAME_DELAY / 1000);
 }
 
+void TapeIndexSearch()
+{
+  tape.index_search = TRUE;
+
+  if (!tape.fast_forward || tape.pause_before_death)
+    SetDrawDeactivationMask(REDRAW_FIELD);
+}
+
+void TapeQuickSave()
+{
+  if (game_status == PLAYING)
+  {
+    if (tape.recording)
+      TapeHaltRecording();     /* prepare tape for saving on-the-fly */
+
+    if (TAPE_IS_EMPTY(tape))
+      Request("No tape that can be saved !", REQ_CONFIRM);
+    else
+      SaveTape(tape.level_nr);
+  }
+  else if (game_status == MAINMENU)
+    Request("No game that can be saved !", REQ_CONFIRM);
+}
+
+void TapeQuickLoad()
+{
+  if (game_status == PLAYING || game_status == MAINMENU)
+  {
+    TapeStop();
+    TapeErase();
+
+    LoadTape(level_nr);
+    if (!TAPE_IS_EMPTY(tape))
+    {
+      TapeStartGamePlaying();
+      TapeIndexSearch();
+
+      tape.quick_resume = TRUE;
+    }
+    else
+      Request("No tape for this level !", REQ_CONFIRM);
+  }
+}
+
+
 /* ---------- new tape button stuff ---------------------------------------- */
 
 /* graphic position values for tape buttons */
@@ -685,17 +792,10 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
       break;
 
     case TAPE_CTRL_ID_INDEX:
-      if (tape.recording)
-       printf("Setting index mark ...\n");
-      else if (tape.playing)
-      {
-       printf("Going to index mark ...\n");
-
-       tape.index_search = TRUE;
-
-       if (!tape.fast_forward || tape.pause_before_death)
-         SetDrawDeactivationMask(REDRAW_FIELD);
-      }
+      if (tape.playing)
+       TapeIndexSearch();
+      else if (tape.recording)
+       ;       /* setting index mark -- not yet implemented */
       break;
 
     case TAPE_CTRL_ID_STOP:
@@ -708,37 +808,11 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 
     case TAPE_CTRL_ID_RECORD:
       if (TAPE_IS_STOPPED(tape))
-      {
-       TapeStartRecording();
-
-#if defined(PLATFORM_UNIX)
-       if (options.network)
-         SendToServer_StartPlaying();
-       else
-#endif
-       {
-         game_status = PLAYING;
-         StopAnimation();
-         InitGame();
-       }
-      }
+       TapeStartGameRecording();
       else if (tape.pausing)
       {
        if (tape.playing)       /* PLAYING -> PAUSING -> RECORDING */
-       {
-         if (tape.game_version != GAME_VERSION_ACTUAL &&
-             !Request("This may break old version tape ! Append anyway ?",
-                      REQ_ASK))
-           break;
-
-         tape.pos[tape.counter].delay = tape.delay_played;
-         tape.playing = FALSE;
-         tape.recording = TRUE;
-         tape.changed = TRUE;
-         tape.game_version = GAME_VERSION_ACTUAL;
-
-         DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
-       }
+         TapeAppendRecording();
        else
          TapeTogglePause();
       }
@@ -750,27 +824,25 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 
       if (TAPE_IS_STOPPED(tape))
       {
-       TapeStartPlaying();
-
-       game_status = PLAYING;
-       StopAnimation();
-       InitGame();
+       TapeStartGamePlaying();
       }
       else if (tape.playing)
       {
        if (tape.pausing)                       /* PAUSE -> PLAY */
+       {
          TapeTogglePause();
+       }
        else if (!tape.fast_forward)            /* PLAY -> FAST FORWARD PLAY */
        {
          tape.fast_forward = TRUE;
          DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
        }
-       else if (!tape.pause_before_death)      /* FFWD PLAY -> + AUTO PAUSE */
+       else if (!tape.pause_before_death)      /* FFWD PLAY -> AUTO PAUSE */
        {
          tape.pause_before_death = TRUE;
          DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
        }
-       else                                    /* -> NORMAL PLAY */
+       else                                    /* AUTO PAUSE -> NORMAL PLAY */
        {
          tape.fast_forward = FALSE;
          tape.pause_before_death = FALSE;

diff --git a/src/tape.h b/src/tape.h
index cfca68224b8f0e7b6a642c2b26cb968634fd78bb..bbc03d8762421e988f87fcd7b3ffdf6247a5ea82 100644 (file)
--- a/src/tape.h
+++ b/src/tape.h
@@ -80,6 +80,7 @@ void DrawVideoDisplay(unsigned long, unsigned long);
 void DrawCompleteVideoDisplay(void);
 
 void TapeStartRecording(void);
+void TapeHaltRecording(void);
 void TapeStopRecording(void);
 void TapeRecordAction(byte *);
 void TapeTogglePause(void);
@@ -89,6 +90,9 @@ byte *TapePlayAction(void);
 void TapeStop(void);
 void TapeErase(void);
 unsigned int GetTapeLength(void);
+void TapeIndexSearch(void);
+void TapeQuickSave(void);
+void TapeQuickLoad(void);
 
 void CreateTapeButtons();
 void MapTapeEjectButton();