X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=a0a06dbcebc02697d1721b1bc31b33fa44e6187e;hb=21c25c56356db2138816a0716d73934ac3893e89;hp=ec2e0e6db510f38d5a56be64b594216b850e95c2;hpb=a4d4e8e444b21b58dcc88b52ff22726c545142a4;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index ec2e0e6d..a0a06dbc 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -24,6 +24,7 @@
 #include "joystick.h"
 #include "cartoons.h"
 #include "network.h"
+#include "init.h"
 
 #ifdef MSDOS
 extern unsigned char get_ascii(KeySym);
@@ -36,13 +37,14 @@ void DrawHeadline()
   int x2 = SX+(SXSIZE - strlen(COPYRIGHT_STRING) * FONT2_XSIZE) / 2;
   int y2 = SY+46;
 
-  DrawText(x1,y1, GAMETITLE_STRING, FS_BIG,FC_YELLOW);
-  DrawText(x2,y2, COPYRIGHT_STRING, FS_SMALL,FC_RED);
+  DrawText(x1,y1, GAMETITLE_STRING, FS_BIG, FC_YELLOW);
+  DrawText(x2,y2, COPYRIGHT_STRING, FS_SMALL, FC_RED);
 }
 
 void DrawMainMenu()
 {
   int i;
+  char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
 
   FadeSounds();
   GetPlayerConfig();
@@ -50,17 +52,17 @@ void DrawMainMenu()
 
   ClearWindow();
   DrawHeadline();
-  DrawText(SX+32, SY+64, "Name:",FS_BIG,FC_GREEN);
-  DrawText(SX+192,SY+64, local_player->alias_name,FS_BIG,FC_RED);
-  DrawText(SX+32, SY+96, "Level:",FS_BIG,FC_GREEN);
-  DrawText(SX+352,SY+96, int2str(level_nr,3),FS_BIG,
+  DrawText(SX + 32,    SY + 2*32, name_text, FS_BIG, FC_GREEN);
+  DrawText(SX + 6*32,  SY + 2*32, setup.alias_name, FS_BIG, FC_RED);
+  DrawText(SX + 32,    SY + 3*32, "Level:", FS_BIG, FC_GREEN);
+  DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG,
 	   (level_nr<leveldir[leveldir_nr].levels ? FC_RED : FC_YELLOW));
-  DrawText(SX+32, SY+128,"Hall Of Fame",FS_BIG,FC_GREEN);
-  DrawText(SX+32, SY+160,"Level Creator",FS_BIG,FC_GREEN);
-  DrawText(SY+32, SY+192,"Info Screen",FS_BIG,FC_GREEN);
-  DrawText(SX+32, SY+224,"Start Game",FS_BIG,FC_GREEN);
-  DrawText(SX+32, SY+256,"Setup",FS_BIG,FC_GREEN);
-  DrawText(SX+32, SY+288,"Quit",FS_BIG,FC_GREEN);
+  DrawText(SX + 32,    SY + 4*32, "Hall Of Fame", FS_BIG, FC_GREEN);
+  DrawText(SX + 32,    SY + 5*32, "Level Creator", FS_BIG, FC_GREEN);
+  DrawText(SY + 32,    SY + 6*32, "Info Screen", FS_BIG, FC_GREEN);
+  DrawText(SX + 32,    SY + 7*32, "Start Game", FS_BIG, FC_GREEN);
+  DrawText(SX + 32,    SY + 8*32, "Setup", FS_BIG, FC_GREEN);
+  DrawText(SX + 32,    SY + 9*32, "Quit", FS_BIG, FC_GREEN);
 
   DrawMicroLevel(MICROLEV_XPOS,MICROLEV_YPOS);
 
@@ -69,11 +71,17 @@ void DrawMainMenu()
   DrawGraphic(10,3,GFX_PFEIL_L);
   DrawGraphic(14,3,GFX_PFEIL_R);
 
-  DrawText(SX+40+16,SY+326,"A Game by Artsoft Entertainment",FS_SMALL,FC_BLUE);
-  DrawText(SX+40+16,SY+344,"Graphics: Deluxe Paint IV Amiga",
-	   FS_SMALL,FC_BLUE);
-  DrawText(SX+60+16,SY+362,"Sounds: AudioMaster IV Amiga",
-	   FS_SMALL,FC_BLUE);
+  DrawText(SX+56, SY+326, "A Game by Artsoft Entertainment",
+	   FS_SMALL, FC_RED);
+
+  if (leveldir[leveldir_nr].name)
+  {
+    int len = strlen(leveldir[leveldir_nr].name);
+    int lxpos = SX+(SXSIZE-len*FONT4_XSIZE)/2;
+    int lypos = SY+352;
+
+    DrawText(lxpos,lypos,leveldir[leveldir_nr].name,FS_SMALL,FC_SPECIAL2);
+  }
 
   FadeToFront();
   InitAnimation();
@@ -133,7 +141,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   }
 
   if (y==4 && ((x==11 && level_nr>0) ||
-	       (x==15 && level_nr<leveldir[leveldir_nr].levels)) &&
+	       (x==15 && level_nr<leveldir[leveldir_nr].levels-1)) &&
       button)
   {
     static long level_delay = 0;
@@ -151,11 +159,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
     level_nr = new_level_nr;
 
-    if (level_nr > local_player->handicap)
-      level_nr = local_player->handicap;
-
-    DrawTextExt(drawto,gc,SX+352,SY+96, int2str(level_nr,3), FS_BIG,FC_RED);
-    DrawTextExt(window,gc,SX+352,SY+96,	int2str(level_nr,3), FS_BIG,FC_RED);
+    DrawTextExt(drawto,gc,SX+11*32,SY+3*32,
+		int2str(level_nr,3), FS_BIG,FC_RED);
+    DrawTextExt(window,gc,SX+11*32,SY+3*32,
+		int2str(level_nr,3), FS_BIG,FC_RED);
 
     LoadLevel(level_nr);
     DrawMicroLevel(MICROLEV_XPOS,MICROLEV_YPOS);
@@ -185,14 +192,14 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       if (y==3)
       {
 	game_status = TYPENAME;
-	HandleTypeName(strlen(local_player->alias_name),0);
+	HandleTypeName(strlen(setup.alias_name),0);
       }
       else if (y==4)
       {
 	if (num_leveldirs)
 	{
 	  game_status = CHOOSELEVEL;
-	  SavePlayerInfo(PLAYER_LEVEL);
+	  SaveLevelSetup();
 	  DrawChooseLevel();
 	}
       }
@@ -215,7 +222,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (y==8)
       {
-	if (setup.autorecord_on)
+	if (setup.autorecord)
 	  TapeStartRecording();
 
 	if (options.network)
@@ -233,13 +240,12 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (y==10)
       {
-	SavePlayerInfo(PLAYER_LEVEL);
+	SaveLevelSetup();
         if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
 	  game_status = EXITGAME;
       }
 
-      if (!button)
-	redraw = TRUE;
+      redraw = TRUE;
     }
   }
   BackToFront();
@@ -681,22 +687,6 @@ void HandleHelpScreen(int button)
   BackToFront();
 }
 
-void CheckCheat()
-{
-  int old_handicap = local_player->handicap;
-
-#if 0
-  if (!strcmp(local_player->alias_name,"Artsoft"))
-#endif
-    local_player->handicap = leveldir[leveldir_nr].levels-1;
-
-  if (local_player->handicap != old_handicap)
-  {
-    SavePlayerInfo(PLAYER_LEVEL);
-    level_nr = local_player->handicap;
-  }
-}
-
 void HandleTypeName(int newxpos, KeySym key)
 {
   static int xpos = 0, ypos = 2;
@@ -705,7 +695,7 @@ void HandleTypeName(int newxpos, KeySym key)
   if (newxpos)
   {
     xpos = newxpos;
-    DrawText(SX+6*32, SY+ypos*32, local_player->alias_name, FS_BIG, FC_YELLOW);
+    DrawText(SX+6*32, SY+ypos*32, setup.alias_name, FS_BIG, FC_YELLOW);
     DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT);
     return;
   }
@@ -722,35 +712,31 @@ void HandleTypeName(int newxpos, KeySym key)
   if((ascii = get_ascii(key)) && xpos<MAX_NAMELEN-1)
   {
 #endif
-    local_player->alias_name[xpos] = ascii;
-    local_player->alias_name[xpos+1] = 0;
+    setup.alias_name[xpos] = ascii;
+    setup.alias_name[xpos+1] = 0;
     xpos++;
     DrawTextExt(drawto,gc,SX+6*32,SY+ypos*32,
-		local_player->alias_name,FS_BIG,FC_YELLOW);
+		setup.alias_name,FS_BIG,FC_YELLOW);
     DrawTextExt(window,gc,SX+6*32,SY+ypos*32,
-		local_player->alias_name,FS_BIG,FC_YELLOW);
+		setup.alias_name,FS_BIG,FC_YELLOW);
     DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT);
   }
   else if ((key==XK_Delete || key==XK_BackSpace) && xpos>0)
   {
     xpos--;
-    local_player->alias_name[xpos] = 0;
+    setup.alias_name[xpos] = 0;
     DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT);
     DrawGraphic(xpos+7,ypos,GFX_LEERRAUM);
   }
   else if (key==XK_Return && xpos>0)
   {
-    DrawText(SX+6*32,SY+ypos*32,local_player->alias_name,FS_BIG,FC_RED);
+    DrawText(SX+6*32,SY+ypos*32,setup.alias_name,FS_BIG,FC_RED);
     DrawGraphic(xpos+6,ypos,GFX_LEERRAUM);
-    SavePlayerInfo(PLAYER_SETUP);
-    CheckCheat();
 
+    SaveSetup();
     game_status = MAINMENU;
-/*
-    DrawMainMenu();
-*/
-
   }
+
   BackToFront();
 }
 
@@ -829,10 +815,11 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     }
     else
     {
-      local_player->leveldir_nr = leveldir_nr = y-3;
-      LoadPlayerInfo(PLAYER_LEVEL);
-      SavePlayerInfo(PLAYER_SETUP);
-      CheckCheat();
+      leveldir_nr = y-3;
+      level_nr =
+	getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename);
+
+      SaveLevelSetup();
 
       TapeErase();
       LoadLevelTape(level_nr);
@@ -842,6 +829,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
       redraw = TRUE;
     }
   }
+
   BackToFront();
 
   if (game_status==CHOOSELEVEL)
@@ -897,26 +885,25 @@ void DrawSetupScreen()
   int i;
   static struct setup
   {
-    unsigned int bit;
-    char *text, *mode[2];
-    int color[2];
-  } setup[] =
+    boolean *value;
+    char *text;
+  } setup_info[] =
   {
-    {SETUP_SOUND,	"Sound:",	{"on", "off"},	{FC_YELLOW,FC_BLUE}},
-    {SETUP_SOUND_LOOPS,	" Sound Loops:",{"on", "off"},	{FC_YELLOW,FC_BLUE}},
-    {SETUP_SOUND_MUSIC,	" Game Music:", {"on", "off"},	{FC_YELLOW,FC_BLUE}},
-    {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}},
-    {0,			"Input Setup",  {"",   ""},	{0,0}},
-    {0,			"",		{"",   ""},	{0,0}},
-    {0,			"",		{"",   ""},	{0,0}},
-    {0,			"Exit",		{"",   ""},	{0,0}},
-    {0,			"Save and exit",{"",   ""},	{0,0}}
+    { &setup.sound,		"Sound:",	},
+    { &setup.sound_loops,	" Sound Loops:"	},
+    { &setup.sound_music,	" Game Music:"	},
+    { &setup.toons,		"Toons:"	},
+    { &setup.double_buffering,	"Buffered gfx:"	},
+    { &setup.scroll_delay,	"Scroll Delay:"	},
+    { &setup.soft_scrolling,	"Soft Scroll.:"	},
+    { &setup.fading,		"Fading:"	},
+    { &setup.quick_doors,	"Quick Doors:"	},
+    { &setup.autorecord,	"Auto-Record:"	},
+    { &setup.team_mode,		"Team-Mode:"	},
+    { NULL,			"Input Devices"	},
+    { NULL,			""		},
+    { NULL,			"Exit"		},
+    { NULL,			"Save and exit"	}
   };
 
   CloseDoor(DOOR_CLOSE_2);
@@ -930,15 +917,15 @@ void DrawSetupScreen()
     if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2))
     {
       DrawGraphic(0,i,GFX_KUGEL_BLAU);
-      DrawText(SX+32,SY+i*32, setup[base].text, FS_BIG,FC_GREEN);
+      DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN);
     }
 
-    if (i < SETUP_SCREEN_POS_EMPTY1)
+    if (setup_info[base].value)
     {
-      int setting_bit = setup[base].bit;
-      int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1);
-      DrawText(SX+14*32, SY+i*32,setup[base].mode[setting_pos],
-	       FS_BIG,setup[base].color[setting_pos]);
+      int setting_value = *setup_info[base].value;
+
+      DrawText(SX+14*32, SY+i*32, (setting_value ? "on" : "off"),
+	       FS_BIG, (setting_value ? FC_YELLOW : FC_BLUE));
     }
   }
 
@@ -1012,132 +999,123 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 
       if (y==3 && sound_status==SOUND_AVAILABLE)
       {
-	if (SETUP_SOUND_ON(local_player->setup))
+	if (setup.sound)
 	{
 	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
 	  DrawText(SX+14*32, SY+(yy+1)*32,"off",FS_BIG,FC_BLUE);
 	  DrawText(SX+14*32, SY+(yy+2)*32,"off",FS_BIG,FC_BLUE);
-	  local_player->setup &= ~SETUP_SOUND_LOOPS;
-	  local_player->setup &= ~SETUP_SOUND_MUSIC;
+	  setup.sound_loops = FALSE;
+	  setup.sound_music = FALSE;
 	}
 	else
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-	local_player->setup ^= SETUP_SOUND;
+	setup.sound = !setup.sound;
       }
       else if (y==4 && sound_loops_allowed)
       {
-	if (SETUP_SOUND_LOOPS_ON(local_player->setup))
+	if (setup.sound_loops)
 	  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);
 	  DrawText(SX+14*32, SY+(yy-1)*32,"on ",FS_BIG,FC_YELLOW);
-	  local_player->setup |= SETUP_SOUND;
+	  setup.sound = TRUE;
 	}
-	local_player->setup ^= SETUP_SOUND_LOOPS;
+	setup.sound_loops = !setup.sound_loops;
       }
       else if (y==5 && sound_loops_allowed)
       {
-	if (SETUP_SOUND_MUSIC_ON(local_player->setup))
+	if (setup.sound_music)
 	  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);
 	  DrawText(SX+14*32, SY+(yy-2)*32,"on ",FS_BIG,FC_YELLOW);
-	  local_player->setup |= SETUP_SOUND;
+	  setup.sound = TRUE;
 	}
-	local_player->setup ^= SETUP_SOUND_MUSIC;
+	setup.sound_music = !setup.sound_music;
       }
       else if (y==6)
       {
-	if (SETUP_TOONS_ON(local_player->setup))
+	if (setup.toons)
 	  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);
-	local_player->setup ^= SETUP_TOONS;
+	setup.toons = !setup.toons;
       }
       else if (y==7)
       {
-	if (!SETUP_DIRECT_DRAW_ON(local_player->setup))
+	if (setup.double_buffering)
 	  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);
-	local_player->setup ^= SETUP_DIRECT_DRAW;
+	setup.double_buffering = !setup.double_buffering;
+	setup.direct_draw = !setup.double_buffering;
       }
       else if (y==8)
       {
-	if (SETUP_SCROLL_DELAY_ON(local_player->setup))
+	if (setup.scroll_delay)
 	  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);
-	local_player->setup ^= SETUP_SCROLL_DELAY;
+	setup.scroll_delay = !setup.scroll_delay;
       }
       else if (y==9)
       {
-	if (SETUP_SOFT_SCROLL_ON(local_player->setup))
+	if (setup.soft_scrolling)
 	  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);
-	local_player->setup ^= SETUP_SOFT_SCROLL;
+	setup.soft_scrolling = !setup.soft_scrolling;
       }
       else if (y==10)
       {
-	if (SETUP_FADING_ON(local_player->setup))
+	if (setup.fading)
 	  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);
-	local_player->setup ^= SETUP_FADING;
+	setup.fading = !setup.fading;
       }
       else if (y==11)
       {
-	if (SETUP_QUICK_DOORS_ON(local_player->setup))
+	if (setup.quick_doors)
 	  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);
-	local_player->setup ^= SETUP_QUICK_DOORS;
+	setup.quick_doors = !setup.quick_doors;
       }
       else if (y==12)
       {
-	if (SETUP_AUTO_RECORD_ON(local_player->setup))
+	if (setup.autorecord)
 	  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);
-	local_player->setup ^= SETUP_AUTO_RECORD;
+	setup.autorecord = !setup.autorecord;
       }
       else if (y==13)
       {
-	game_status = SETUPINPUT;
-	DrawSetupInputScreen();
-	redraw = TRUE;
-      }
-
-#if 0
-      else if (y==13)
-      {
-	if (SETUP_2ND_JOYSTICK_ON(local_player->setup))
-	  DrawText(SX+14*32, SY+yy*32,"1st",FS_BIG,FC_YELLOW);
+	if (setup.team_mode)
+	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
 	else
-	  DrawText(SX+14*32, SY+yy*32,"2nd",FS_BIG,FC_YELLOW);
-	local_player->setup ^= SETUP_2ND_JOYSTICK;
+	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+	setup.team_mode = !setup.team_mode;
       }
       else if (y==14)
       {
-	/*
-	CalibrateJoystick();
-	*/
-
-	CustomizeKeyboard();
-
+	game_status = SETUPINPUT;
+	DrawSetupInputScreen();
 	redraw = TRUE;
       }
-#endif
-
       else if (y==pos_end-1 || y==pos_end)
       {
         if (y==pos_end)
 	{
-	  SavePlayerInfo(PLAYER_SETUP);
+	  SaveSetup();
+
+	  /*
 	  SaveJoystickData();
+	  */
+
 	}
 
 	game_status = MAINMENU;
@@ -1154,90 +1132,139 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 
 void DrawSetupInputScreen()
 {
-#if 0
-  static struct setup
-  {
-    unsigned int bit;
-    char *text, *mode[2];
-    int color[2];
-  } setup[] =
-  {
-    {SETUP_SOUND,	"Sound:",	{"on", "off"},	{FC_YELLOW,FC_BLUE}},
-    {SETUP_SOUND_LOOPS,	" Sound Loops:",{"on", "off"},	{FC_YELLOW,FC_BLUE}},
-    {SETUP_SOUND_MUSIC,	" Game Music:", {"on", "off"},	{FC_YELLOW,FC_BLUE}},
-    {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}},
-    {SETUP_2ND_JOYSTICK,"Joystick:",	{"2nd","1st"},	{FC_YELLOW,FC_YELLOW}},
-    {0,			"Cal. Joystick",{"",   ""},	{0,0}},
-    {0,			"",		{"",   ""},	{0,0}},
-    {0,			"Exit",		{"",   ""},	{0,0}},
-    {0,			"Save and exit",{"",   ""},	{0,0}}
-  };
-#endif
-
   ClearWindow();
   DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW);
 
   DrawGraphic(0, 2, GFX_KUGEL_BLAU);
   DrawGraphic(0, 3, GFX_KUGEL_BLAU);
   DrawGraphic(0, 4, GFX_KUGEL_BLAU);
+  DrawGraphic(0, 15, GFX_KUGEL_BLAU);
+  DrawGraphic(10, 2, GFX_PFEIL_L);
+  DrawGraphic(12, 2, GFX_PFEIL_R);
 
   DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN);
-  DrawText(SX+12*32, SY+2*32, "1", FS_BIG, FC_RED);
-  DrawGraphic(9,2,GFX_PFEIL_L);
-  DrawGraphic(11,2,GFX_PFEIL_R);
+  DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
+  DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
+
+  FadeToFront();
+  InitAnimation();
+  HandleSetupInputScreen(0,0,0,0,MB_MENU_INITIALIZE);
+}
+
+static int getJoystickNrFromDeviceName(char *device_name)
+{
+  char c;
+  int joystick_nr = 0;
+
+  if (device_name == NULL || device_name[0] == '\0')
+    return 0;
+
+  c = device_name[strlen(device_name) - 1];
+
+  if (c >= '0' && c <= '9')
+    joystick_nr = (int)(c - '0');
+
+  if (joystick_nr < 0 || joystick_nr >= MAX_PLAYERS)
+    joystick_nr = 0;
+
+  return joystick_nr;
+}
+
+static void setJoystickDeviceToNr(char *device_name, int device_nr)
+{
+  if (device_name == NULL)
+    return;
+
+  if (device_nr < 0 || device_nr >= MAX_PLAYERS)
+    device_nr = 0;
 
-  DrawText(SX+32, SY+3*32, "Inputdevice:", FS_BIG, FC_GREEN);
-  if (setup.joy_input[0].use_joystick)
+  if (strlen(device_name) > 1)
   {
-    DrawText(SX+13*32, SY+3*32,
-	     (setup.joy_input[0].joystick_nr == 0 ? "JOY1" : "JOY2"),
+    char c1 = device_name[strlen(device_name) - 1];
+    char c2 = device_name[strlen(device_name) - 2];
+
+    if (c1 >= '0' && c1 <= '9' && !(c2 >= '0' && c2 <= '9'))
+      device_name[strlen(device_name) - 1] = '0' + (char)(device_nr % 10);
+  }
+  else
+    strcpy(device_name, joystick_device_name[device_nr]);
+}
+
+static void drawPlayerSetupInputInfo(int player_nr)
+{
+  int i;
+  static struct SetupKeyboardInfo custom_key;
+  static struct
+  {
+    KeySym *keysym;
+    char *text;
+  } custom[] =
+  {
+    { &custom_key.left,  "Joystick Left"  },
+    { &custom_key.right, "Joystick Right" },
+    { &custom_key.up,    "Joystick Up"    },
+    { &custom_key.down,  "Joystick Down"  },
+    { &custom_key.snap,  "Button 1"       },
+    { &custom_key.bomb,  "Button 2"       }
+  };
+  static char *joystick_name[MAX_PLAYERS] =
+  {
+    "Joystick1",
+    "Joystick2",
+    "Joystick3",
+    "Joystick4"
+  };
+
+  custom_key = setup.input[player_nr].key;
+
+  DrawText(SX+11*32, SY+2*32, int2str(player_nr + 1, 1), FS_BIG, FC_RED);
+  DrawGraphic(8, 2, GFX_SPIELER1 + player_nr);
+
+  if (setup.input[player_nr].use_joystick)
+  {
+    char *device_name = setup.input[player_nr].joy.device_name;
+
+    DrawText(SX+8*32, SY+3*32,
+	     joystick_name[getJoystickNrFromDeviceName(device_name)],
 	     FS_BIG, FC_YELLOW);
     DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN);
   }
   else
   {
-    DrawText(SX+13*32, SY+3*32, "KEYS", FS_BIG, FC_YELLOW);
+    DrawText(SX+8*32, SY+3*32, "Keyboard ", FS_BIG, FC_YELLOW);
     DrawText(SX+32, SY+4*32, "Customize", FS_BIG, FC_GREEN);
   }
 
-  DrawGraphic(0, 15, GFX_KUGEL_BLAU);
-  DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
-
-#if 0
-  for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++)
+  DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN);
+  DrawGraphic(1, 6, GFX_PFEIL_L);
+  DrawGraphic(1, 7, GFX_PFEIL_R);
+  DrawGraphic(1, 8, GFX_PFEIL_O);
+  DrawGraphic(1, 9, GFX_PFEIL_U);
+  DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE);
+  DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE);
+  DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE);
+  DrawText(SX+2*32, SY+9*32, ":", FS_BIG, FC_BLUE);
+  DrawText(SX+32, SY+10*32, "Snap Field:", FS_BIG, FC_BLUE);
+  DrawText(SX+32, SY+12*32, "Place Bomb:", FS_BIG, FC_BLUE);
+
+  for (i=0; i<6; i++)
   {
-    int base = i - SETUP_SCREEN_POS_START;
-
-    if (i != SETUP_SCREEN_POS_EMPTY)
-    {
-      DrawGraphic(0,i,GFX_KUGEL_BLAU);
-      DrawText(SX+32,SY+i*32, setup[base].text, FS_BIG,FC_GREEN);
-    }
-
-    if (i < SETUP_SCREEN_POS_EMPTY)
-    {
-      int setting_bit = setup[base].bit;
-      int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1);
-      DrawText(SX+14*32, SY+i*32,setup[base].mode[setting_pos],
-	       FS_BIG,setup[base].color[setting_pos]);
-    }
+    int ypos = 6 + i + (i > 3 ? i-3 : 0);
+
+    DrawText(SX + 3*32, SY + ypos*32,
+	     "              ", FS_BIG, FC_YELLOW);
+    DrawText(SX + 3*32, SY + ypos*32,
+	     (setup.input[player_nr].use_joystick ?
+	      custom[i].text :
+	      getKeyNameFromKeySym(*custom[i].keysym)),
+	     FS_BIG, FC_YELLOW);
   }
-#endif
-
-  FadeToFront();
-  InitAnimation();
-  HandleSetupInputScreen(0,0,0,0,MB_MENU_INITIALIZE);
 }
 
 void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 3;
+  static int player_nr = 0;
   static int redraw = TRUE;
   int x = (mx+32-SX)/32, y = (my+32-SY)/32;
   int pos_start  = SETUPINPUT_SCREEN_POS_START  + 1;
@@ -1246,7 +1273,10 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
   int pos_end    = SETUPINPUT_SCREEN_POS_END    + 1;
 
   if (button == MB_MENU_INITIALIZE)
+  {
+    drawPlayerSetupInputInfo(player_nr);
     redraw = TRUE;
+  }
 
   if (redraw)
   {
@@ -1259,10 +1289,21 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
 
   if (dx || dy)
   {
-    if (dy)
+    if (dx && choice == 3)
     {
+      x = (dx < 0 ? 11 : 13);
+      y = 3;
+    }
+    else if (dx && choice == 4)
+    {
+      button = MB_MENU_CHOICE;
       x = 1;
-      y = choice+dy;
+      y = 4;
+    }
+    else if (dy)
+    {
+      x = 1;
+      y = choice + dy;
     }
     else
       x = y = 0;
@@ -1282,170 +1323,111 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
     y = choice;
   }
 
-  if (x==1 && y >= pos_start && y <= pos_end &&
-      !(y >= pos_empty1 && y <= pos_empty2))
+  if (y == 3 && ((x == 1 && !button) || ((x == 11 || x == 13) && button)))
+  {
+    static long delay = 0;
+
+    if (!DelayReached(&delay, 150))
+      goto out;
+
+    player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
+
+    drawPlayerSetupInputInfo(player_nr);
+  }
+  else if (x==1 && y >= pos_start && y <= pos_end &&
+	   !(y >= pos_empty1 && y <= pos_empty2))
   {
     if (button)
     {
-      if (y!=choice)
+      if (y != choice)
       {
-	DrawGraphic(0,y-1,GFX_KUGEL_ROT);
-	DrawGraphic(0,choice-1,GFX_KUGEL_BLAU);
+	DrawGraphic(0, y-1, GFX_KUGEL_ROT);
+	DrawGraphic(0, choice-1, GFX_KUGEL_BLAU);
       }
       choice = y;
     }
     else
     {
-#if 0
-      int yy = y-1;
-
-      if (y==3 && sound_status==SOUND_AVAILABLE)
+      if (y == 4)
       {
-	if (SETUP_SOUND_ON(local_player->setup))
-	{
-	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-	  DrawText(SX+14*32, SY+(yy+1)*32,"off",FS_BIG,FC_BLUE);
-	  DrawText(SX+14*32, SY+(yy+2)*32,"off",FS_BIG,FC_BLUE);
-	  local_player->setup &= ~SETUP_SOUND_LOOPS;
-	  local_player->setup &= ~SETUP_SOUND_MUSIC;
-	}
-	else
-	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-	local_player->setup ^= SETUP_SOUND;
-      }
-      else if (y==4 && sound_loops_allowed)
-      {
-	if (SETUP_SOUND_LOOPS_ON(local_player->setup))
-	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-	else
+	char *device_name = setup.input[player_nr].joy.device_name;
+
+	if (!setup.input[player_nr].use_joystick)
 	{
-	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-	  DrawText(SX+14*32, SY+(yy-1)*32,"on ",FS_BIG,FC_YELLOW);
-	  local_player->setup |= SETUP_SOUND;
+	  int new_device_nr = (dx >= 0 ? 0 : MAX_PLAYERS - 1);
+
+	  setJoystickDeviceToNr(device_name, new_device_nr);
+	  setup.input[player_nr].use_joystick = TRUE;
 	}
-	local_player->setup ^= SETUP_SOUND_LOOPS;
-      }
-      else if (y==5 && sound_loops_allowed)
-      {
-	if (SETUP_SOUND_MUSIC_ON(local_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);
-	  DrawText(SX+14*32, SY+(yy-2)*32,"on ",FS_BIG,FC_YELLOW);
-	  local_player->setup |= SETUP_SOUND;
+	  int device_nr = getJoystickNrFromDeviceName(device_name);
+	  int new_device_nr = device_nr + (dx >= 0 ? +1 : -1);
+
+	  if (new_device_nr < 0 || new_device_nr >= MAX_PLAYERS)
+	    setup.input[player_nr].use_joystick = FALSE;
+	  else
+	    setJoystickDeviceToNr(device_name, new_device_nr);
 	}
-	local_player->setup ^= SETUP_SOUND_MUSIC;
-      }
-      else if (y==6)
-      {
-	if (SETUP_TOONS_ON(local_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);
-	local_player->setup ^= SETUP_TOONS;
-      }
-      else if (y==7)
-      {
-	if (!SETUP_DIRECT_DRAW_ON(local_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);
-	local_player->setup ^= SETUP_DIRECT_DRAW;
-      }
-      else if (y==8)
-      {
-	if (SETUP_SCROLL_DELAY_ON(local_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);
-	local_player->setup ^= SETUP_SCROLL_DELAY;
-      }
-      else if (y==9)
-      {
-	if (SETUP_SOFT_SCROLL_ON(local_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);
-	local_player->setup ^= SETUP_SOFT_SCROLL;
-      }
-      else if (y==10)
-      {
-	if (SETUP_FADING_ON(local_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);
-	local_player->setup ^= SETUP_FADING;
-      }
-      else if (y==11)
-      {
-	if (SETUP_QUICK_DOORS_ON(local_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);
-	local_player->setup ^= SETUP_QUICK_DOORS;
-      }
-      else if (y==12)
-      {
-	if (SETUP_AUTO_RECORD_ON(local_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);
-	local_player->setup ^= SETUP_AUTO_RECORD;
-      }
-      else if (y==13)
-      {
-	if (SETUP_2ND_JOYSTICK_ON(local_player->setup))
-	  DrawText(SX+14*32, SY+yy*32,"1st",FS_BIG,FC_YELLOW);
-	else
-	  DrawText(SX+14*32, SY+yy*32,"2nd",FS_BIG,FC_YELLOW);
-	local_player->setup ^= SETUP_2ND_JOYSTICK;
-      }
-      else if (y==14)
-      {
+
+
 	/*
-	CalibrateJoystick();
+	InitJoysticks();
 	*/
 
-	CustomizeKeyboard();
 
-	redraw = TRUE;
+#if 0
+	int one_joystick_nr       = (dx >= 0 ? 0 : 1);
+	int the_other_joystick_nr = (dx >= 0 ? 1 : 0);
+
+	if (setup.input[player_nr].use_joystick)
+	{
+	  if (setup.input[player_nr].joystick_nr == one_joystick_nr)
+	    setup.input[player_nr].joystick_nr = the_other_joystick_nr;
+	  else
+	    setup.input[player_nr].use_joystick = FALSE;
+	}
+	else
+	{
+	  setup.input[player_nr].use_joystick = TRUE;
+	  setup.input[player_nr].joystick_nr = one_joystick_nr;
+	}
+#endif
+
+	drawPlayerSetupInputInfo(player_nr);
       }
-      else if (y==pos_end-1 || y==pos_end)
+      else if (y == 5)
       {
-        if (y==pos_end)
+	if (setup.input[player_nr].use_joystick)
 	{
-	  SavePlayerInfo(PLAYER_SETUP);
-	  SaveJoystickData();
+	  InitJoysticks();
+	  CalibrateJoystick(player_nr);
 	}
+	else
+	  CustomizeKeyboard(player_nr);
 
-	game_status = MAINMENU;
-	DrawMainMenu();
 	redraw = TRUE;
       }
-#endif
-
-
-      if (y==pos_end)
+      else if (y == pos_end)
       {
+	InitJoysticks();
+
 	game_status = SETUP;
 	DrawSetupScreen();
 	redraw = TRUE;
       }
-
-
     }
   }
   BackToFront();
 
-  if (game_status==SETUP)
+  out:
+
+  if (game_status == SETUPINPUT)
     DoAnimation();
 }
 
-void CustomizeKeyboard( /* int player_nr */ )
+void CustomizeKeyboard(int player_nr)
 {
-  int player_nr = 0;
-
   int i;
   int step_nr;
   boolean finished = FALSE;
@@ -1464,7 +1446,8 @@ void CustomizeKeyboard( /* int player_nr */ )
     { &custom_key.bomb,  "Place Bomb" }
   };
 
-  custom_key = setup.key_input[player_nr];
+  /* read existing key bindings from player setup */
+  custom_key = setup.input[player_nr].key;
 
   ClearWindow();
   DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW);
@@ -1478,7 +1461,8 @@ void CustomizeKeyboard( /* int player_nr */ )
   DrawText(SX, SY + (2+2*step_nr+1)*32,
 	   "Key:", FS_BIG, FC_RED);
   DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
-	   getKeySymName(*customize_step[step_nr].keysym), FS_BIG, FC_BLUE);
+	   getKeyNameFromKeySym(*customize_step[step_nr].keysym),
+	   FS_BIG, FC_BLUE);
 
   while(!finished)
   {
@@ -1501,8 +1485,9 @@ void CustomizeKeyboard( /* int player_nr */ )
 	      break;
 	    }
 
+	    /* press 'Enter' to keep the existing key binding */
 	    if (key == XK_Return || step_nr == 6)
-	      break;
+	      key = *customize_step[step_nr].keysym;
 
 	    /* check if key already used */
 	    for (i=0; i<step_nr; i++)
@@ -1514,9 +1499,9 @@ void CustomizeKeyboard( /* int player_nr */ )
 	    /* got new key binding */
 	    *customize_step[step_nr].keysym = key;
 	    DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
-		     "            ", FS_BIG, FC_YELLOW);
+		     "             ", FS_BIG, FC_YELLOW);
 	    DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
-		     getKeySymName(key), FS_BIG, FC_YELLOW);
+		     getKeyNameFromKeySym(key), FS_BIG, FC_YELLOW);
 	    step_nr++;
 
 	    /* un-highlight last query */
@@ -1525,7 +1510,7 @@ void CustomizeKeyboard( /* int player_nr */ )
 	    DrawText(SX, SY+(2+2*(step_nr-1)+1)*32,
 		     "Key:", FS_BIG, FC_GREEN);
 
-	    /* query 'Enter' to leave */
+	    /* press 'Enter' to leave */
 	    if (step_nr == 6)
 	    {
 	      DrawText(SX + 16, SY + 15*32+16,
@@ -1539,7 +1524,7 @@ void CustomizeKeyboard( /* int player_nr */ )
 	    DrawText(SX, SY+(2+2*step_nr+1)*32,
 		     "Key:", FS_BIG, FC_RED);
 	    DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32,
-		     getKeySymName(*customize_step[step_nr].keysym),
+		     getKeyNameFromKeySym(*customize_step[step_nr].keysym),
 		     FS_BIG, FC_BLUE);
 	  }
 	  break;
@@ -1561,11 +1546,14 @@ void CustomizeKeyboard( /* int player_nr */ )
     Delay(10);
   }
 
+  /* write new key bindings back to player setup */
+  setup.input[player_nr].key = custom_key;
+
   StopAnimation();
-  DrawSetupScreen();
+  DrawSetupInputScreen();
 }
 
-void CalibrateJoystick()
+void CalibrateJoystick(int player_nr)
 {
 #ifdef __FreeBSD__
   struct joystick joy_ctrl;
@@ -1582,7 +1570,7 @@ void CalibrateJoystick()
   char joy_nr[4];
 #endif
 
-  int joystick_nr = setup.joy_input[0].joystick_nr;
+  int joystick_fd = stored_player[player_nr].joystick_fd;
   int new_joystick_xleft = 128, new_joystick_xright = 128;
   int new_joystick_yupper = 128, new_joystick_ylower = 128;
   int new_joystick_xmiddle, new_joystick_ymiddle;
@@ -1595,6 +1583,9 @@ void CalibrateJoystick()
   if (joystick_status == JOYSTICK_OFF)
     return;
 
+  if (!setup.input[player_nr].use_joystick || joystick_fd < 0)
+    return;
+
   ClearWindow();
   DrawText(SX,      SY +  6*32, " ROTATE JOYSTICK ",FS_BIG,FC_YELLOW);
   DrawText(SX,      SY +  7*32, "IN ALL DIRECTIONS",FS_BIG,FC_YELLOW);
@@ -1611,7 +1602,7 @@ void CalibrateJoystick()
     }
   }
 
-  joy = Joystick();
+  joy = Joystick(player_nr);
   last_x = (joy & JOY_LEFT ? -1 : joy & JOY_RIGHT ? +1 : 0);
   last_y = (joy & JOY_UP   ? -1 : joy & JOY_DOWN  ? +1 : 0);
   DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
@@ -1624,7 +1615,7 @@ void CalibrateJoystick()
   joy_ctrl.buttons = 0;
 #endif
 
-  while(Joystick() & JOY_BUTTON);
+  while(Joystick(player_nr) & JOY_BUTTON);
 
   InitAnimation();
 
@@ -1666,7 +1657,7 @@ void CalibrateJoystick()
       }
     }
 
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
+    if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
     {
       joystick_status = JOYSTICK_OFF;
       goto error_out;
@@ -1682,16 +1673,16 @@ void CalibrateJoystick()
     new_joystick_ymiddle =
       new_joystick_yupper + (new_joystick_ylower - new_joystick_yupper) / 2;
 
-    joystick[joystick_nr].xleft = new_joystick_xleft;
-    joystick[joystick_nr].yupper = new_joystick_yupper;
-    joystick[joystick_nr].xright = new_joystick_xright;
-    joystick[joystick_nr].ylower = new_joystick_ylower;
-    joystick[joystick_nr].xmiddle = new_joystick_xmiddle;
-    joystick[joystick_nr].ymiddle = new_joystick_ymiddle;
+    setup.input[player_nr].joy.xleft = new_joystick_xleft;
+    setup.input[player_nr].joy.yupper = new_joystick_yupper;
+    setup.input[player_nr].joy.xright = new_joystick_xright;
+    setup.input[player_nr].joy.ylower = new_joystick_ylower;
+    setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle;
+    setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
 
     CheckJoystickData();
 
-    joy = Joystick();
+    joy = Joystick(player_nr);
 
     if (joy & JOY_BUTTON && check_remaining == 0)
       result = 1;
@@ -1715,13 +1706,13 @@ void CalibrateJoystick()
 
 #if 0
       printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n",
-	     joystick[joystick_nr].xleft,
-	     joystick[joystick_nr].xmiddle,
-	     joystick[joystick_nr].xright);
+	     setup.input[player_nr].joy.xleft,
+	     setup.input[player_nr].joy.xmiddle,
+	     setup.input[player_nr].joy.xright);
       printf("UP / MIDDLE / DOWN == %d / %d / %d\n",
-	     joystick[joystick_nr].yupper,
-	     joystick[joystick_nr].ymiddle,
-	     joystick[joystick_nr].ylower);
+	     setup.input[player_nr].joy.yupper,
+	     setup.input[player_nr].joy.ymiddle,
+	     setup.input[player_nr].joy.ylower);
 #endif
     }
 
@@ -1734,20 +1725,24 @@ void CalibrateJoystick()
 
   StopAnimation();
 
-  DrawSetupScreen();
-  while(Joystick() & JOY_BUTTON);
+  DrawSetupInputScreen();
+  while(Joystick(player_nr) & JOY_BUTTON);
   return;
 
- error_out:
+  error_out:
 
   ClearWindow();
   DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW);
   DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW);
   BackToFront();
   Delay(3000);
-  DrawSetupScreen();
+  DrawSetupInputScreen();
 }
 
+
+
+#if 0
+
 void CalibrateJoystick_OLD()
 {
 #ifdef __FreeBSD__
@@ -1765,7 +1760,7 @@ void CalibrateJoystick_OLD()
   char joy_nr[4];
 #endif
 
-  int joystick_nr = setup.joy_input[0].joystick_nr;
+  int joystick_nr = setup.input[0].joystick_nr;
   int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle;
   int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle;
 
@@ -1859,12 +1854,12 @@ void CalibrateJoystick_OLD()
   new_joystick_xmiddle = joy_ctrl.x;
   new_joystick_ymiddle = joy_ctrl.y;
 
-  joystick[joystick_nr].xleft = new_joystick_xleft;
-  joystick[joystick_nr].yupper = new_joystick_yupper;
-  joystick[joystick_nr].xright = new_joystick_xright;
-  joystick[joystick_nr].ylower = new_joystick_ylower;
-  joystick[joystick_nr].xmiddle = new_joystick_xmiddle;
-  joystick[joystick_nr].ymiddle = new_joystick_ymiddle;
+  setup.input[player_nr].joy.xleft = new_joystick_xleft;
+  setup.input[player_nr].joy.yupper = new_joystick_yupper;
+  setup.input[player_nr].joy.xright = new_joystick_xright;
+  setup.input[player_nr].joy.ylower = new_joystick_ylower;
+  setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle;
+  setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
 
   CheckJoystickData();
 
@@ -1920,7 +1915,11 @@ void CalibrateJoystick_OLD()
   DrawSetupScreen();
 }
 
-void HandleGameActions(byte player_action)
+#endif
+
+
+
+void HandleGameActions()
 {
   if (game_status != PLAYING)
     return;
@@ -1931,7 +1930,7 @@ void HandleGameActions(byte player_action)
   if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
     TapeStop();
 
-  GameActions(player_action);
+  GameActions();
 
   BackToFront();
 }
@@ -2046,17 +2045,15 @@ void HandleSoundButtons(int mx, int my, int button)
   switch(CheckSoundButtons(mx,my,button))
   {
     case BUTTON_SOUND_MUSIC:
-      if (setup.sound_music_on)
+      if (setup.sound_music)
       { 
-	setup.sound_music_on = FALSE;
-	local_player->setup &= ~SETUP_SOUND_MUSIC;
+	setup.sound_music = FALSE;
 	FadeSound(background_loop[level_nr % num_bg_loops]);
 	DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF);
       }
       else if (sound_loops_allowed)
       { 
-	setup.sound_on = setup.sound_music_on = TRUE;
-	local_player->setup |= (SETUP_SOUND | SETUP_SOUND_MUSIC);
+	setup.sound = setup.sound_music = TRUE;
 	PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
 	DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON);
       }
@@ -2065,16 +2062,14 @@ void HandleSoundButtons(int mx, int my, int button)
       break;
 
     case BUTTON_SOUND_LOOPS:
-      if (setup.sound_loops_on)
+      if (setup.sound_loops)
       { 
-	setup.sound_loops_on = FALSE;
-	local_player->setup &= ~SETUP_SOUND_LOOPS;
+	setup.sound_loops = FALSE;
 	DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF);
       }
       else if (sound_loops_allowed)
       { 
-	setup.sound_on = setup.sound_loops_on = TRUE;
-	local_player->setup |= (SETUP_SOUND | SETUP_SOUND_LOOPS);
+	setup.sound = setup.sound_loops = TRUE;
 	DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON);
       }
       else
@@ -2082,16 +2077,14 @@ void HandleSoundButtons(int mx, int my, int button)
       break;
 
     case BUTTON_SOUND_SIMPLE:
-      if (setup.sound_simple_on)
+      if (setup.sound_simple)
       { 
-	setup.sound_simple_on = FALSE;
-	local_player->setup &= ~SETUP_SOUND;
+	setup.sound_simple = FALSE;
 	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF);
       }
       else if (sound_status==SOUND_AVAILABLE)
       { 
-	setup.sound_on = setup.sound_simple_on = TRUE;
-	local_player->setup |= SETUP_SOUND;
+	setup.sound = setup.sound_simple = TRUE;
 	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON);
       }
       else
@@ -2146,30 +2139,6 @@ void HandleGameButtons(int mx, int my, int button)
       }
       else
 	TapeTogglePause();
-
-      /*
-      if (tape.pausing)
-      {
-	if (options.network)
-	  SendToServer_ContinuePlaying();
-	else
-	{
-	  tape.pausing = FALSE;
-	  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
-	}
-      }
-      else
-      {
-	if (options.network)
-	  SendToServer_PausePlaying();
-	else
-	{
-	  tape.pausing = TRUE;
-	  DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0);
-	}
-      }
-      */
-
       break;
 
     case BUTTON_GAME_PLAY: