rnd-19980918
[rocksndiamonds.git] / src / screens.c
index 3a8f0bb5e39ff0138a79a048e18e26d2ba3c4505..9cc9235e6f780899c90c35ea63e232a1a25234dc 100644 (file)
 #include "files.h"
 #include "buttons.h"
 #include "tape.h"
+#include "joystick.h"
+#include "cartoons.h"
+
+#ifdef MSDOS
+extern unsigned char get_ascii(KeySym);
+#endif
 
 void DrawHeadline()
 {
@@ -71,7 +77,7 @@ void DrawMainMenu()
 
   FadeToFront();
   InitAnimation();
-  HandleMainMenu(0,0,0,0,MB_MENU_MARK);
+  HandleMainMenu(0,0,0,0,MB_MENU_INITIALIZE);
 
   TapeStop();
   if (TAPE_IS_EMPTY(tape))
@@ -80,6 +86,7 @@ void DrawMainMenu()
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 
+  ClearEventQueue();
   XAutoRepeatOn(display);
 }
 
@@ -89,12 +96,15 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   static int redraw = TRUE;
   int x = (mx+32-SX)/32, y = (my+32-SY)/32;
 
-  if (redraw || (!mx && !my && !dx && !dy))
+  if (redraw || button == MB_MENU_INITIALIZE)
   {
     DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
     redraw = FALSE;
   }
 
+  if (button == MB_MENU_INITIALIZE)
+    return;
+
   if (dx || dy)
   {
     if (dx && choice==4)
@@ -136,7 +146,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     if (new_level_nr>leveldir[leveldir_nr].levels-1)
       new_level_nr = leveldir[leveldir_nr].levels-1;
 
-    if (old_level_nr==new_level_nr || !DelayReached(&level_delay,15))
+    if (old_level_nr==new_level_nr || !DelayReached(&level_delay,150))
       goto out;
 
     level_nr = new_level_nr;
@@ -223,7 +233,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
          game_status = EXITGAME;
       }
 
-      redraw = TRUE;
+      if (!button)
+       redraw = TRUE;
     }
   }
   BackToFront();
@@ -244,7 +255,12 @@ static int helpscreen_frame[MAX_HELPSCREEN_ELS];
 static int helpscreen_delay[MAX_HELPSCREEN_ELS];
 static int helpscreen_action[] =
 {
-  GFX_SPIELFIGUR,1,100,                                                HA_NEXT,
+  GFX_SPIELER_DOWN,4,2,
+  GFX_SPIELER_UP,4,2,
+  GFX_SPIELER_LEFT,4,2,
+  GFX_SPIELER_RIGHT,4,2,
+  GFX_SPIELER_PUSH_LEFT,4,2,
+  GFX_SPIELER_PUSH_RIGHT,4,2,                                  HA_NEXT,
   GFX_ERDREICH,1,100,                                          HA_NEXT,
   GFX_LEERRAUM,1,100,                                          HA_NEXT,
   GFX_MORAST_LEER,1,100,                                       HA_NEXT,
@@ -254,7 +270,7 @@ static int helpscreen_action[] =
   GFX_MAUER_L1,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,     HA_NEXT,
   GFX_UNSICHTBAR,1,100,                                                HA_NEXT,
   GFX_FELSBODEN,1,100,                                         HA_NEXT,
-  GFX_CHAR_A,30,3, GFX_CHAR_AUSRUF,32,3,                       HA_NEXT,
+  GFX_CHAR_A,30,4, GFX_CHAR_AUSRUF,32,4,                       HA_NEXT,
   GFX_EDELSTEIN,2,5,                                           HA_NEXT,
   GFX_DIAMANT,2,5,                                             HA_NEXT,
   GFX_EDELSTEIN_BD,2,5,                                                HA_NEXT,
@@ -272,9 +288,9 @@ static int helpscreen_action[] =
   GFX_ERZ_EDEL_LILA,1,50, GFX_EXPLOSION,8,1,
   GFX_EDELSTEIN_LILA,1,10,                                     HA_NEXT,
   GFX_GEBLUBBER,4,4,                                           HA_NEXT,
-  GFX_SCHLUESSEL1,4,33,                                                HA_NEXT,
-  GFX_PFORTE1,4,33,                                            HA_NEXT,
-  GFX_PFORTE1X,4,33,                                           HA_NEXT,
+  GFX_SCHLUESSEL1,4,25,                                                HA_NEXT,
+  GFX_PFORTE1,4,25,                                            HA_NEXT,
+  GFX_PFORTE1X,4,25,                                           HA_NEXT,
   GFX_DYNAMIT_AUS,1,100,                                       HA_NEXT,
   GFX_DYNAMIT,7,6, GFX_EXPLOSION,8,1, GFX_LEERRAUM,1,10,       HA_NEXT,
   GFX_DYNABOMB+0,4,3, GFX_DYNABOMB+3,1,3, GFX_DYNABOMB+2,1,3,
@@ -290,36 +306,53 @@ static int helpscreen_action[] =
   GFX_KAEFER+5,1,1, GFX_KAEFER+1,1,1, GFX_KAEFER+5,1,1,
   GFX_KAEFER+6,1,1, GFX_KAEFER+2,1,1, GFX_KAEFER+6,1,1,
   GFX_KAEFER+7,1,1, GFX_KAEFER+3,1,1, GFX_KAEFER+7,1,1,                HA_NEXT,
-  GFX_BUTTERFLY,1,1, GFX_BUTTERFLY+1,1,1,                      HA_NEXT,
-  GFX_FIREFLY,1,1, GFX_FIREFLY+1,1,1,                          HA_NEXT,
+  GFX_BUTTERFLY,2,2,                                           HA_NEXT,
+  GFX_FIREFLY,2,2,                                             HA_NEXT,
   GFX_PACMAN+0,1,3, GFX_PACMAN+4,1,2, GFX_PACMAN+0,1,3,
   GFX_PACMAN+1,1,3, GFX_PACMAN+5,1,2, GFX_PACMAN+1,1,3,
   GFX_PACMAN+2,1,3, GFX_PACMAN+6,1,2, GFX_PACMAN+2,1,3,
   GFX_PACMAN+3,1,3, GFX_PACMAN+7,1,2, GFX_PACMAN+3,1,3,                HA_NEXT,
-  GFX_MAMPFER+0,4,0, GFX_MAMPFER+3,1,0, GFX_MAMPFER+2,1,0,
-  GFX_MAMPFER+1,1,0, GFX_MAMPFER+0,1,0,                                HA_NEXT,
-  GFX_MAMPFER2+0,4,0, GFX_MAMPFER2+3,1,0, GFX_MAMPFER2+2,1,0,
-  GFX_MAMPFER2+1,1,0, GFX_MAMPFER2+0,1,0,                      HA_NEXT,
-  GFX_ZOMBIE+0,4,0, GFX_ZOMBIE+3,1,0, GFX_ZOMBIE+2,1,0,
-  GFX_ZOMBIE+1,1,0, GFX_ZOMBIE+0,1,0,                          HA_NEXT,
+  GFX_MAMPFER+0,4,1, GFX_MAMPFER+3,1,1, GFX_MAMPFER+2,1,1,
+  GFX_MAMPFER+1,1,1, GFX_MAMPFER+0,1,1,                                HA_NEXT,
+  GFX_MAMPFER2+0,4,1, GFX_MAMPFER2+3,1,1, GFX_MAMPFER2+2,1,1,
+  GFX_MAMPFER2+1,1,1, GFX_MAMPFER2+0,1,1,                      HA_NEXT,
+  GFX_ROBOT+0,4,1, GFX_ROBOT+3,1,1, GFX_ROBOT+2,1,1,
+  GFX_ROBOT+1,1,1, GFX_ROBOT+0,1,1,                            HA_NEXT,
+  GFX_MAULWURF_DOWN,4,2,
+  GFX_MAULWURF_UP,4,2,
+  GFX_MAULWURF_LEFT,4,2,
+  GFX_MAULWURF_RIGHT,4,2,                                      HA_NEXT,
+  GFX_PINGUIN_DOWN,4,2,
+  GFX_PINGUIN_UP,4,2,
+  GFX_PINGUIN_LEFT,4,2,
+  GFX_PINGUIN_RIGHT,4,2,                                       HA_NEXT,
+  GFX_SCHWEIN_DOWN,4,2,
+  GFX_SCHWEIN_UP,4,2,
+  GFX_SCHWEIN_LEFT,4,2,
+  GFX_SCHWEIN_RIGHT,4,2,                                       HA_NEXT,
+  GFX_DRACHE_DOWN,4,2,
+  GFX_DRACHE_UP,4,2,
+  GFX_DRACHE_LEFT,4,2,
+  GFX_DRACHE_RIGHT,4,2,                                                HA_NEXT,
+  GFX_SONDE_START,8,1,                                         HA_NEXT,
   GFX_ABLENK,4,1,                                              HA_NEXT,
-  GFX_BIRNE_AUS,1,33, GFX_BIRNE_EIN,1,33,                      HA_NEXT,
-  GFX_ZEIT_VOLL,1,33, GFX_ZEIT_LEER,1,33,                      HA_NEXT,
-  GFX_TROPFEN,1,33, GFX_AMOEBING,4,1, GFX_AMOEBE_LEBT,1,10,    HA_NEXT,
+  GFX_BIRNE_AUS,1,25, GFX_BIRNE_EIN,1,25,                      HA_NEXT,
+  GFX_ZEIT_VOLL,1,25, GFX_ZEIT_LEER,1,25,                      HA_NEXT,
+  GFX_TROPFEN,1,25, GFX_AMOEBING,4,1, GFX_AMOEBE_LEBT,1,10,    HA_NEXT,
   GFX_AMOEBE_TOT+2,2,50, GFX_AMOEBE_TOT,2,50,                  HA_NEXT,
   GFX_AMOEBE_LEBT,4,40,                                                HA_NEXT,
   GFX_AMOEBE_LEBT,1,10,        GFX_AMOEBING,4,2,                       HA_NEXT,
-  GFX_AMOEBE_LEBT,1,33, GFX_AMOEBE_TOT,1,33, GFX_EXPLOSION,8,1,
+  GFX_AMOEBE_LEBT,1,25, GFX_AMOEBE_TOT,1,25, GFX_EXPLOSION,8,1,
   GFX_DIAMANT,1,10,                                            HA_NEXT,
   GFX_LIFE,1,100,                                              HA_NEXT,
   GFX_LIFE_ASYNC,1,100,                                                HA_NEXT,
   GFX_SIEB_LEER,4,2,                                           HA_NEXT,
   GFX_SIEB2_LEER,4,2,                                          HA_NEXT,
   GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2,
-  GFX_AUSGANG_AUF+0,4,1, GFX_AUSGANG_AUF+3,1,1,
-  GFX_AUSGANG_AUF+2,1,1, GFX_AUSGANG_AUF+1,1,1,                        HA_NEXT,
-  GFX_AUSGANG_AUF+0,4,1, GFX_AUSGANG_AUF+3,1,1,
-  GFX_AUSGANG_AUF+2,1,1, GFX_AUSGANG_AUF+1,1,1,                        HA_NEXT,
+  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
+  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
+  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
+  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
   HA_END
 };
 static char *helpscreen_eltext[][2] =
@@ -362,6 +395,11 @@ static char *helpscreen_eltext[][2] =
  {"Cruncher: Eats diamonds and you,",  "if you're not careful"},
  {"Cruncher (BD style):",              "Eats almost everything"},
  {"Robot: Tries to kill the player",   ""},
+ {"The mole: You must guide him savely","to the exit; he will follow you"},
+ {"The penguin: Guide him to the exit,","but keep him away from monsters!"},
+ {"The Pig: Harmless, but eats all",   "gems it can get"},
+ {"The Dragon: Breathes fire,",                "especially to some monsters"},
+ {"Sonde: Follows you everywhere;",    "harmless, but may block your way"},
  {"Magic Wheel: Touch it to get rid of","the robots for some seconds"},
  {"Light Bulb: All of them must be",   "switched on to finish a level"},
  {"Extra Time Orb: Adds some seconds", "to the time available for the level"},
@@ -394,7 +432,7 @@ static int helpscreen_musicpos;
 void DrawHelpScreenElAction(int start)
 {
   int i = 0, j = 0;
-  int frame, delay, graphic;
+  int frame, graphic;
   int xstart = SX+16, ystart = SY+64+2*32, ystep = TILEY+4;
 
   while(helpscreen_action[j] != HA_END)
@@ -427,8 +465,7 @@ void DrawHelpScreenElAction(int start)
       helpscreen_frame[i-start] = helpscreen_action[j++]-1;
     }
 
-    delay = helpscreen_action[j++];
-    helpscreen_delay[i-start] = delay;
+    helpscreen_delay[i-start] = helpscreen_action[j++] - 1;
 
     if (helpscreen_action[j] == HA_NEXT)
     {
@@ -444,15 +481,15 @@ void DrawHelpScreenElAction(int start)
     }
     j++;
 
-    DrawGraphicExtHiRes(drawto,gc,xstart,ystart+(i-start)*ystep,
-                       graphic+frame);
+    DrawGraphicExt(drawto, gc, xstart, ystart+(i-start)*ystep, graphic+frame);
     i++;
   }
 
-  redraw_tiles += 28;
   for(i=2;i<16;i++)
-    redraw[0][i] = redraw[1][i] = TRUE;
-  redraw_mask |= REDRAW_TILES;
+  {
+    MarkTileDirty(0,i);
+    MarkTileDirty(1,i);
+  }
 }
 
 void DrawHelpScreenElText(int start)
@@ -628,7 +665,7 @@ void HandleHelpScreen(int button)
   }
   else
   {
-    if (DelayReached(&hs_delay,3))
+    if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2))
     {
       if (helpscreen_state<num_helpscreen_els_pages)
        DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
@@ -666,6 +703,7 @@ void HandleTypeName(int newxpos, KeySym key)
     return;
   }
 
+#ifndef MSDOS
   if ((key>=XK_A && key<=XK_Z) || (key>=XK_a && key<=XK_z && 
       xpos<MAX_NAMELEN-1))
   {
@@ -673,6 +711,10 @@ void HandleTypeName(int newxpos, KeySym key)
       ascii = 'A'+(char)(key-XK_A);
     if (key>=XK_a && key<=XK_z)
       ascii = 'a'+(char)(key-XK_a);
+#else
+  if((ascii = get_ascii(key)) && xpos<MAX_NAMELEN-1)
+  {
+#endif
     player.alias_name[xpos] = ascii;
     player.alias_name[xpos+1] = 0;
     xpos++;
@@ -682,7 +724,7 @@ void HandleTypeName(int newxpos, KeySym key)
                player.alias_name,FS_BIG,FC_YELLOW);
     DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT);
   }
-  else if (key==XK_Delete && xpos>0)
+  else if ((key==XK_Delete || key==XK_BackSpace) && xpos>0)
   {
     xpos--;
     player.alias_name[xpos] = 0;
@@ -721,7 +763,7 @@ void DrawChooseLevel()
 
   FadeToFront();
   InitAnimation();
-  HandleChooseLevel(0,0,0,0,MB_MENU_MARK);
+  HandleChooseLevel(0,0,0,0,MB_MENU_INITIALIZE);
 }
 
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
@@ -730,12 +772,21 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
   static int redraw = TRUE;
   int x = (mx+32-SX)/32, y = (my+32-SY)/32;
 
+  if (button == MB_MENU_INITIALIZE)
+  {
+    redraw = TRUE;
+    choice = leveldir_nr + 3;
+  }
+
   if (redraw)
   {
     DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
     redraw = FALSE;
   }
 
+  if (button == MB_MENU_INITIALIZE)
+    return;
+
   if (dx || dy)
   {
     if (dy)
@@ -850,6 +901,7 @@ void DrawSetupScreen()
     {SETUP_TOONS,      "Toons:",       {"on", "off"},  {FC_YELLOW,FC_BLUE}},
     {SETUP_DIRECT_DRAW,        "Buffered gfx:",{"off","on" },  {FC_BLUE,FC_YELLOW}},
     {SETUP_SCROLL_DELAY,"Scroll Delay:",{"on", "off"}, {FC_YELLOW,FC_BLUE}},
+    {SETUP_SOFT_SCROLL,        "Soft Scroll.:",{"on", "off"},  {FC_YELLOW,FC_BLUE}},
     {SETUP_FADING,     "Fading:",      {"on", "off"},  {FC_YELLOW,FC_BLUE}},
     {SETUP_QUICK_DOORS,        "Quick Doors:", {"on", "off"},  {FC_YELLOW,FC_BLUE}},
     {SETUP_AUTO_RECORD,        "Auto-Record:", {"on", "off"},  {FC_YELLOW,FC_BLUE}},
@@ -885,7 +937,7 @@ void DrawSetupScreen()
 
   FadeToFront();
   InitAnimation();
-  HandleSetupScreen(0,0,0,0,MB_MENU_MARK);
+  HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE);
 }
 
 void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
@@ -897,12 +949,18 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
   int pos_empty = SETUP_SCREEN_POS_EMPTY + 1;
   int pos_end   = SETUP_SCREEN_POS_END   + 1;
 
+  if (button == MB_MENU_INITIALIZE)
+    redraw = TRUE;
+
   if (redraw)
   {
     DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
     redraw = FALSE;
   }
 
+  if (button == MB_MENU_INITIALIZE)
+    return;
+
   if (dx || dy)
   {
     if (dy)
@@ -1006,6 +1064,14 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
        player.setup ^= SETUP_SCROLL_DELAY;
       }
       else if (y==9)
+      {
+       if (SETUP_SOFT_SCROLL_ON(player.setup))
+         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
+       else
+         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+       player.setup ^= SETUP_SOFT_SCROLL;
+      }
+      else if (y==10)
       {
        if (SETUP_FADING_ON(player.setup))
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1013,7 +1079,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        player.setup ^= SETUP_FADING;
       }
-      else if (y==10)
+      else if (y==11)
       {
        if (SETUP_QUICK_DOORS_ON(player.setup))
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1021,7 +1087,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        player.setup ^= SETUP_QUICK_DOORS;
       }
-      else if (y==11)
+      else if (y==12)
       {
        if (SETUP_AUTO_RECORD_ON(player.setup))
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1029,7 +1095,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        player.setup ^= SETUP_AUTO_RECORD;
       }
-      else if (y==12)
+      else if (y==13)
       {
        if (SETUP_2ND_JOYSTICK_ON(player.setup))
          DrawText(SX+14*32, SY+yy*32,"1st",FS_BIG,FC_YELLOW);
@@ -1037,7 +1103,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"2nd",FS_BIG,FC_YELLOW);
        player.setup ^= SETUP_2ND_JOYSTICK;
       }
-      else if (y==13)
+      else if (y==14)
       {
        CalibrateJoystick();
        redraw = TRUE;
@@ -1075,12 +1141,17 @@ void CalibrateJoystick()
   } joy_ctrl;
 #endif
 
+#ifdef MSDOS
+  char joy_nr[4];
+#endif
+
   int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle;
   int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle;
 
   if (joystick_status==JOYSTICK_OFF)
     goto error_out;
 
+#ifndef MSDOS
   ClearWindow();
   DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
   DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
@@ -1104,7 +1175,7 @@ void CalibrateJoystick()
       joystick_status=JOYSTICK_OFF;
       goto error_out;
     }
-    Delay(10000);
+    Delay(10);
   }
 
   new_joystick_xleft = joy_ctrl.x;
@@ -1133,7 +1204,7 @@ void CalibrateJoystick()
       joystick_status=JOYSTICK_OFF;
       goto error_out;
     }
-    Delay(10000);
+    Delay(10);
   }
 
   new_joystick_xright = joy_ctrl.x;
@@ -1161,7 +1232,7 @@ void CalibrateJoystick()
       joystick_status=JOYSTICK_OFF;
       goto error_out;
     }
-    Delay(10000);
+    Delay(10);
   }
 
   new_joystick_xmiddle = joy_ctrl.x;
@@ -1180,12 +1251,51 @@ void CalibrateJoystick()
   while(Joystick() & JOY_BUTTON);
   return;
 
+#endif
   error_out:
 
+#ifdef MSDOS
+  joy_nr[0] = '#';
+  joy_nr[1] = SETUP_2ND_JOYSTICK_ON(player.setup)+49;
+  joy_nr[2] = '\0';
+
+  remove_joystick();
+  ClearWindow();
+  DrawText(SX+32, SY+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW);
+  DrawText(SX+16+7*32, SY+8*32, joy_nr, FS_BIG,FC_YELLOW);
+  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
+  BackToFront();
+
+  for(clear_keybuf();!keypressed(););
+  install_joystick(JOY_TYPE_2PADS);
+
+  ClearWindow();
+  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
+  DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
+  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
+  BackToFront();
+
+  for(clear_keybuf();!keypressed(););
+  calibrate_joystick(SETUP_2ND_JOYSTICK_ON(player.setup));
+
+  ClearWindow();
+  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
+  DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW);
+  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
+  BackToFront();
+
+  for(clear_keybuf();!keypressed(););
+  calibrate_joystick(SETUP_2ND_JOYSTICK_ON(player.setup));
+
+  DrawSetupScreen();
+  return;
+#endif
+
   ClearWindow();
   DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW);
   DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW);
-  Delay(3000000);
+  BackToFront();
+  Delay(3000);
   DrawSetupScreen();
 }
 
@@ -1197,10 +1307,12 @@ void HandleGameActions()
   if (LevelSolved)
     GameWon();
 
-  if (GameOver && !TAPE_IS_STOPPED(tape))
+  if (PlayerGone && !TAPE_IS_STOPPED(tape))
     TapeStop();
 
   GameActions();
+
+  BackToFront();
 }
 
 void HandleVideoButtons(int mx, int my, int button)
@@ -1246,6 +1358,7 @@ void HandleVideoButtons(int mx, int my, int button)
          tape.pos[tape.counter].delay = tape.delay_played;
          tape.playing = FALSE;
          tape.recording = TRUE;
+         tape.changed = TRUE;
 
          DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
        }