added missing recording modes to tape recorder display state function

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index ff6d10f250c8e48d6e440b0bbbb3eb9690944f9e..919bd418455f9749b5490bf4445de947b3371a05 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -356,20 +356,26 @@ void DrawVideoDisplaySymbol(unsigned int state)
   DrawVideoDisplay(state, VIDEO_DISPLAY_SYMBOL_ONLY);
 }
 
-void DrawVideoDisplayPlayState()
+void DrawVideoDisplayCurrentState()
 {
   int state = 0;
 
   DrawVideoDisplay(VIDEO_STATE_OFF, 0);
 
-  state |= VIDEO_STATE_PLAY_ON;
-
   if (tape.pausing)
-  {
     state |= VIDEO_STATE_PAUSE_ON;
+
+  if (tape.recording)
+  {
+    state |= VIDEO_STATE_REC_ON;
+
+    if (tape.single_step)
+      state |= VIDEO_STATE_1STEP_ON;
   }
-  else
+  else if (tape.playing)
   {
+    state |= VIDEO_STATE_PLAY_ON;
+
     if (tape.deactivate_display)
       state |= VIDEO_STATE_WARP2_ON;
     else if (tape.warp_forward)
@@ -673,7 +679,7 @@ void TapeTogglePause(boolean toggle_manual)
   if (tape.single_step && toggle_manual)
     tape.single_step = FALSE;
 
-  DrawVideoDisplayPlayState();
+  DrawVideoDisplayCurrentState();
 
   if (tape.deactivate_display)
   {
@@ -883,7 +889,7 @@ static void TapeStartWarpForward()
 
   TapeDeactivateDisplayOn();
 
-  DrawVideoDisplayPlayState();
+  DrawVideoDisplayCurrentState();
 }
 
 static void TapeStopWarpForward()
@@ -896,7 +902,7 @@ static void TapeStopWarpForward()
 
   TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
 
-  DrawVideoDisplayPlayState();
+  DrawVideoDisplayCurrentState();
 }
 
 static void TapeSingleStep()
@@ -1308,24 +1314,30 @@ static void HandleTapeButtonsExt(int id)
       {
        tape.pause_before_end = !tape.pause_before_end;
 
-       DrawVideoDisplayPlayState();
+       DrawVideoDisplayCurrentState();
       }
       else if (tape.recording)
+      {
        TapeSingleStep();
+      }
 
       break;
 
     case TAPE_CTRL_ID_STOP:
       TapeStop();
+
       break;
 
     case TAPE_CTRL_ID_PAUSE:
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
+
       break;
 
     case TAPE_CTRL_ID_RECORD:
       if (TAPE_IS_STOPPED(tape))
+      {
        TapeStartGameRecording();
+      }
       else if (tape.pausing)
       {
        if (tape.playing)                       /* PLAY -> PAUSE -> RECORD */
@@ -1333,6 +1345,7 @@ static void HandleTapeButtonsExt(int id)
        else
          TapeTogglePause(TAPE_TOGGLE_MANUAL);
       }
+
       break;
 
     case TAPE_CTRL_ID_PLAY:
@@ -1357,9 +1370,10 @@ static void HandleTapeButtonsExt(int id)
          // continue playing in normal mode
          tape.fast_forward = FALSE;
          tape.warp_forward = FALSE;
-         tape.pause_before_end = FALSE;
          tape.deactivate_display = FALSE;
 
+         tape.pause_before_end = FALSE;
+
          TapeTogglePause(TAPE_TOGGLE_MANUAL);
        }
        else if (!tape.fast_forward)            /* PLAY -> FFWD */
@@ -1385,8 +1399,9 @@ static void HandleTapeButtonsExt(int id)
          TapeDeactivateDisplayOff(game_status == GAME_MODE_PLAYING);
        }
 
-       DrawVideoDisplayPlayState();
+       DrawVideoDisplayCurrentState();
       }
+
       break;
 
     default: