X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftape.c;h=f75bc897e6f4579f1908050253b3ce1c0c2c3f01;hp=447ce12c92367faa1ff10491ac8761d450fe693b;hb=70fe541d68f18a22eb3bd134f128c0d56b885701;hpb=2c7c5df21805bb03a1ef56e7577c1d7d1cc3f599

diff --git a/src/tape.c b/src/tape.c
index 447ce12c..f75bc897 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -28,8 +28,10 @@
 #define TAPE_CTRL_ID_PAUSE			3
 #define TAPE_CTRL_ID_RECORD			4
 #define TAPE_CTRL_ID_PLAY			5
+#define TAPE_CTRL_ID_INSERT_SOLUTION		6
+#define TAPE_CTRL_ID_PLAY_SOLUTION		7
 
-#define NUM_TAPE_BUTTONS			6
+#define NUM_TAPE_BUTTONS			8
 
 /* values for tape handling */
 #define TAPE_PAUSE_SECONDS_BEFORE_DEATH		5
@@ -1077,7 +1079,7 @@ void TapeQuickLoad()
   }
 }
 
-void InsertSolutionTape()
+boolean InsertSolutionTape()
 {
   boolean level_has_tape = (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
 			    level.native_sp_level->demo.is_available);
@@ -1086,18 +1088,37 @@ void InsertSolutionTape()
   {
     Request("No solution tape for this level!", REQ_CONFIRM);
 
-    return;
+    return FALSE;
   }
 
+  if (!TAPE_IS_STOPPED(tape))
+    TapeStop();
+
   // if tape recorder already contains a tape, remove it without asking
   TapeErase();
 
   LoadSolutionTape(level_nr);
 
+  DrawCompleteVideoDisplay();
+
   if (TAPE_IS_EMPTY(tape))
+  {
     Request("Loading solution tape for this level failed!", REQ_CONFIRM);
 
-  DrawCompleteVideoDisplay();
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+boolean PlaySolutionTape()
+{
+  if (!InsertSolutionTape())
+    return FALSE;
+
+  TapeStartGamePlaying();
+
+  return TRUE;
 }
 
 
@@ -1273,6 +1294,14 @@ static struct
   {
     IMG_GFX_TAPE_BUTTON_PLAY,		&tape.button.play,
     TAPE_CTRL_ID_PLAY,			"play tape"
+  },
+  {
+    IMG_GFX_TAPE_BUTTON_INSERT_SOLUTION,&tape.button.insert_solution,
+    TAPE_CTRL_ID_INSERT_SOLUTION,	"insert solution tape"
+  },
+  {
+    IMG_GFX_TAPE_BUTTON_PLAY_SOLUTION,	&tape.button.play_solution,
+    TAPE_CTRL_ID_PLAY_SOLUTION,		"play solution tape"
   }
 };
 
@@ -1282,7 +1311,8 @@ void CreateTapeButtons()
 
   for (i = 0; i < NUM_TAPE_BUTTONS; i++)
   {
-    struct GraphicInfo *gfx = &graphic_info[tapebutton_info[i].graphic];
+    int graphic = tapebutton_info[i].graphic;
+    struct GraphicInfo *gfx = &graphic_info[graphic];
     struct XY *pos = tapebutton_info[i].pos;
     struct GadgetInfo *gi;
     int gd_x = gfx->src_x;
@@ -1292,6 +1322,7 @@ void CreateTapeButtons()
     int id = i;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_IMAGE_ID, graphic,
 		      GDI_INFO_TEXT, tapebutton_info[i].infotext,
 		      GDI_X, VX + pos->x,
 		      GDI_Y, VY + pos->y,
@@ -1503,6 +1534,16 @@ static void HandleTapeButtonsExt(int id)
 
       break;
 
+    case TAPE_CTRL_ID_INSERT_SOLUTION:
+      InsertSolutionTape();
+
+      break;
+
+    case TAPE_CTRL_ID_PLAY_SOLUTION:
+      PlaySolutionTape();
+
+      break;
+
     default:
       break;
   }