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

diff --git a/src/screens.c b/src/screens.c
index ec2e0e6d..c0a3b8c6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -24,6 +24,22 @@
 #include "joystick.h"
 #include "cartoons.h"
 #include "network.h"
+#include "init.h"
+
+/* for DrawSetupScreen(), HandleSetupScreen() */
+#define SETUP_SCREEN_POS_START		2
+#define SETUP_SCREEN_POS_END		16
+#define SETUP_SCREEN_POS_EMPTY1		(SETUP_SCREEN_POS_END - 2)
+#define SETUP_SCREEN_POS_EMPTY2		(SETUP_SCREEN_POS_END - 2)
+
+/* for HandleSetupInputScreen() */
+#define SETUPINPUT_SCREEN_POS_START	2
+#define SETUPINPUT_SCREEN_POS_END	15
+#define SETUPINPUT_SCREEN_POS_EMPTY1	(SETUPINPUT_SCREEN_POS_START + 3)
+#define SETUPINPUT_SCREEN_POS_EMPTY2	(SETUPINPUT_SCREEN_POS_END - 1)
+
+/* for HandleChooseLevel() */
+#define MAX_LEVEL_SERIES_ON_SCREEN	15
 
 #ifdef MSDOS
 extern unsigned char get_ascii(KeySym);
@@ -31,18 +47,16 @@ extern unsigned char get_ascii(KeySym);
 
 void DrawHeadline()
 {
-  int x1 = SX+(SXSIZE - strlen(GAMETITLE_STRING) * FONT1_XSIZE) / 2;
-  int y1 = SY+8;
-  int x2 = SX+(SXSIZE - strlen(COPYRIGHT_STRING) * FONT2_XSIZE) / 2;
-  int y2 = SY+46;
+  int x = SX + (SXSIZE - strlen(GAMETITLE_STRING) * FONT1_XSIZE) / 2;
 
-  DrawText(x1,y1, GAMETITLE_STRING, FS_BIG,FC_YELLOW);
-  DrawText(x2,y2, COPYRIGHT_STRING, FS_SMALL,FC_RED);
+  DrawText(x, SY + 8, GAMETITLE_STRING, FS_BIG, FC_YELLOW);
+  DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING);
 }
 
 void DrawMainMenu()
 {
   int i;
+  char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
 
   FadeSounds();
   GetPlayerConfig();
@@ -50,38 +64,46 @@ 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,
-	   (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 + 2*32, name_text, FS_BIG, FC_GREEN);
+  DrawText(SX + 6*32,  SY + 2*32, setup.player_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,
+	   (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW));
+  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);
 
-  for(i=2;i<10;i++)
-    DrawGraphic(0,i,GFX_KUGEL_BLAU);
-  DrawGraphic(10,3,GFX_PFEIL_L);
-  DrawGraphic(14,3,GFX_PFEIL_R);
+  for(i=2; i<10; i++)
+    DrawGraphic(0, i, GFX_KUGEL_BLAU);
+  DrawGraphic(10, 3, GFX_PFEIL_L);
+  DrawGraphic(14, 3, GFX_PFEIL_R);
+
+  DrawTextF(15*32 + 6, 3*32 + 9, FC_RED, "%d", leveldir[leveldir_nr].levels);
 
-  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();
-  HandleMainMenu(0,0,0,0,MB_MENU_INITIALIZE);
+  HandleMainMenu(0,0, 0,0, MB_MENU_INITIALIZE);
 
   TapeStop();
   if (TAPE_IS_EMPTY(tape))
-    LoadLevelTape(level_nr);
+    LoadTape(level_nr);
   DrawCompleteVideoDisplay();
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
@@ -94,11 +116,11 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 3;
   static int redraw = TRUE;
-  int x = (mx+32-SX)/32, y = (my+32-SY)/32;
+  int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32;
 
   if (redraw || button == MB_MENU_INITIALIZE)
   {
-    DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
+    DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
     redraw = FALSE;
   }
 
@@ -107,22 +129,22 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
   if (dx || dy)
   {
-    if (dx && choice==4)
+    if (dx && choice == 4)
     {
-      x = (dx<0 ? 11 : 15);
+      x = (dx < 0 ? 11 : 15);
       y = 4;
     }
     else if (dy)
     {
       x = 1;
-      y = choice+dy;
+      y = choice + dy;
     }
     else
       x = y = 0;
 
-    if (y<3)
+    if (y < 3)
       y = 3;
-    else if (y>10)
+    else if (y > 10)
       y = 10;
   }
 
@@ -132,121 +154,122 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     y = choice;
   }
 
-  if (y==4 && ((x==11 && level_nr>0) ||
-	       (x==15 && level_nr<leveldir[leveldir_nr].levels)) &&
+  if (y == 4 && ((x == 11 && level_nr > 0) ||
+		 (x == 15 && level_nr < leveldir[leveldir_nr].levels - 1)) &&
       button)
   {
-    static long level_delay = 0;
-    int step = (button==1 ? 1 : button==2 ? 5 : 10);
+    static unsigned long level_delay = 0;
+    int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
     int new_level_nr, old_level_nr = level_nr;
+    int font_color = (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW);
 
-    new_level_nr = level_nr + (x==11 ? -step : +step);
-    if (new_level_nr<0)
+    new_level_nr = level_nr + (x == 11 ? -step : +step);
+    if (new_level_nr < 0)
       new_level_nr = 0;
-    if (new_level_nr>leveldir[leveldir_nr].levels-1)
-      new_level_nr = leveldir[leveldir_nr].levels-1;
+    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,150))
+    if (old_level_nr == new_level_nr || !DelayReached(&level_delay, 150))
       goto out;
 
     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, font_color);
+    DrawTextExt(window, gc, SX + 11 * 32, SY + 3 * 32,
+		int2str(level_nr, 3), FS_BIG, font_color);
 
     LoadLevel(level_nr);
-    DrawMicroLevel(MICROLEV_XPOS,MICROLEV_YPOS);
+    DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS);
 
     TapeErase();
-    LoadLevelTape(level_nr);
+    LoadTape(level_nr);
     DrawCompleteVideoDisplay();
 
     /* needed because DrawMicroLevel() takes some time */
     BackToFront();
-    XSync(display,FALSE);
-    DelayReached(&level_delay,0);	/* reset delay counter */
+    XSync(display, FALSE);
+    DelayReached(&level_delay, 0);	/* reset delay counter */
   }
-  else if (x==1 && y>=3 && y<=10)
+  else if (x == 1 && y >= 3 && y <= 10)
   {
     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;
       }
-      choice = y;
     }
     else
     {
-      if (y==3)
+      if (y == 3)
       {
 	game_status = TYPENAME;
-	HandleTypeName(strlen(local_player->alias_name),0);
+	HandleTypeName(strlen(setup.player_name), 0);
       }
-      else if (y==4)
+      else if (y == 4)
       {
 	if (num_leveldirs)
 	{
 	  game_status = CHOOSELEVEL;
-	  SavePlayerInfo(PLAYER_LEVEL);
+	  SaveLevelSetup();
 	  DrawChooseLevel();
 	}
       }
-      else if (y==5)
+      else if (y == 5)
       {
 	game_status = HALLOFFAME;
 	DrawHallOfFame(-1);
       }
-      else if (y==6)
+      else if (y == 6)
       {
-	game_status = LEVELED;
 	if (leveldir[leveldir_nr].readonly)
-	  Request("This level is read only !",REQ_CONFIRM);
+	  Request("This level is read only !", REQ_CONFIRM);
+	game_status = LEVELED;
 	DrawLevelEd();
       }
-      else if (y==7)
+      else if (y == 7)
       {
 	game_status = HELPSCREEN;
 	DrawHelpScreen();
       }
-      else if (y==8)
+      else if (y == 8)
       {
-	if (setup.autorecord_on)
+	if (setup.autorecord)
 	  TapeStartRecording();
 
+#ifndef MSDOS
 	if (options.network)
 	  SendToServer_StartPlaying();
 	else
+#endif
 	{
 	  game_status = PLAYING;
 	  InitGame();
 	}
       }
-      else if (y==9)
+      else if (y == 9)
       {
 	game_status = SETUP;
 	DrawSetupScreen();
       }
-      else if (y==10)
+      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();
 
   out:
 
-  if (game_status==MAINMENU)
+  if (game_status == MAINMENU)
     DoAnimation();
 }
 
@@ -500,64 +523,51 @@ void DrawHelpScreenElAction(int start)
 void DrawHelpScreenElText(int start)
 {
   int i;
-  int xstart = SX+56, ystart = SY+65+2*32, ystep = TILEY+4;
-  char text[FULL_SXSIZE/FONT2_XSIZE+10];
+  int xstart = SX + 56, ystart = SY + 65 + 2 * 32, ystep = TILEY + 4;
+  int ybottom = SYSIZE - 20;
 
   ClearWindow();
   DrawHeadline();
 
-  sprintf(text,"The game elements:");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+100,
-	   text,FS_SMALL,FC_GREEN);
+  DrawTextFCentered(100, FC_GREEN, "The game elements:");
 
-  for(i=start;i<start+MAX_HELPSCREEN_ELS && i<num_helpscreen_els;i++)
+  for(i=start; i < start + MAX_HELPSCREEN_ELS && i < num_helpscreen_els; i++)
   {
-    DrawText(xstart,ystart+(i-start)*ystep+(*helpscreen_eltext[i][1] ? 0 : 8),
-	     helpscreen_eltext[i][0],FS_SMALL,FC_YELLOW);
-    DrawText(xstart,ystart+(i-start)*ystep+16,
-	     helpscreen_eltext[i][1],FS_SMALL,FC_YELLOW);
+    DrawText(xstart,
+	     ystart + (i - start) * ystep + (*helpscreen_eltext[i][1] ? 0 : 8),
+	     helpscreen_eltext[i][0], FS_SMALL, FC_YELLOW);
+    DrawText(xstart, ystart + (i - start) * ystep + 16,
+	     helpscreen_eltext[i][1], FS_SMALL, FC_YELLOW);
   }
 
-  sprintf(text,"Press any key or button for next page");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+SYSIZE-20,
-	   text,FS_SMALL,FC_BLUE);
+  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
 }
 
 void DrawHelpScreenMusicText(int num)
 {
   int ystart = 150, ystep = 30;
-  char text[FULL_SXSIZE/FONT2_XSIZE+10];
+  int ybottom = SYSIZE - 20;
 
   FadeSounds();
   ClearWindow();
   DrawHeadline();
 
-  sprintf(text,"The game background music loops:");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+100,
-	   text,FS_SMALL,FC_GREEN);
-
-  sprintf(text,"Excerpt from");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+0*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,"%c%s%c",'\"',helpscreen_music[num][0],'\"');
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+1*ystep,
-	   text,FS_SMALL,FC_RED);
-  sprintf(text,"by");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+2*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,"%s",helpscreen_music[num][1]);
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+3*ystep,
-	   text,FS_SMALL,FC_RED);
-  sprintf(text,"from the album");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+4*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,"%c%s%c",'\"',helpscreen_music[num][2],'\"');
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+5*ystep,
-	   text,FS_SMALL,FC_RED);
-
-  sprintf(text,"Press any key or button for next page");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+SYSIZE-20,
-	   text,FS_SMALL,FC_BLUE);
+  DrawTextFCentered(100, FC_GREEN, "The game background music loops:");
+
+  DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
+		    "Excerpt from");
+  DrawTextFCentered(ystart + 1 * ystep, FC_RED, "\"%s\"",
+		    helpscreen_music[num][0]);
+  DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
+		    "by");
+  DrawTextFCentered(ystart + 3 * ystep, FC_RED,
+		    "%s", helpscreen_music[num][1]);
+  DrawTextFCentered(ystart + 4 * ystep, FC_YELLOW,
+		    "from the album");
+  DrawTextFCentered(ystart + 5 * ystep, FC_RED, "\"%s\"",
+		    helpscreen_music[num][2]);
+
+  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
 
   PlaySoundLoop(background_loop[num]);
 }
@@ -565,54 +575,65 @@ void DrawHelpScreenMusicText(int num)
 void DrawHelpScreenCreditsText()
 {
   int ystart = 150, ystep = 30;
-  char text[FULL_SXSIZE/FONT2_XSIZE+10];
+  int ybottom = SYSIZE - 20;
 
   FadeSounds();
   ClearWindow();
   DrawHeadline();
 
-  sprintf(text,"Program information:");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+100,
-	   text,FS_SMALL,FC_GREEN);
-
-  sprintf(text,"This game is Freeware!");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+0*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,"If you like it, send e-mail to:");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+1*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,"aeglos@valinor.owl.de");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+2*ystep,
-	   text,FS_SMALL,FC_RED);
-  sprintf(text,"or SnailMail to:");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+3*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,"Holger Schemel");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+4*ystep,
-	   text,FS_SMALL,FC_RED);
-  sprintf(text,"Sennehof 28");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+4*ystep+20,
-	   text,FS_SMALL,FC_RED);
-  sprintf(text,"33659 Bielefeld");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+4*ystep+40,
-	   text,FS_SMALL,FC_RED);
-  sprintf(text,"Germany");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+4*ystep+60,
-	   text,FS_SMALL,FC_RED);
-
-  sprintf(text,"If you have created new levels,");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+7*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,"send them to me to include them!");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+8*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-  sprintf(text,":-)");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+ystart+9*ystep,
-	   text,FS_SMALL,FC_YELLOW);
-
-  sprintf(text,"Press any key or button for main menu");
-  DrawText(SX+(SXSIZE-strlen(text)*FONT2_XSIZE)/2,SY+SYSIZE-20,
-	   text,FS_SMALL,FC_BLUE);
+  DrawTextFCentered(100, FC_GREEN,
+		    "Credits:");
+  DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
+		    "DOS/Windows port of the game:");
+  DrawTextFCentered(ystart + 1 * ystep, FC_RED,
+		    "Guido Schulz");
+  DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
+		    "Additional toons:");
+  DrawTextFCentered(ystart + 3 * ystep, FC_RED,
+		    "Karl Hörnell");
+  DrawTextFCentered(ystart + 5 * ystep, FC_YELLOW,
+		    "...and many thanks to all contributors");
+  DrawTextFCentered(ystart + 6 * ystep, FC_YELLOW,
+		    "of new levels!");
+
+  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
+}
+
+void DrawHelpScreenContactText()
+{
+  int ystart = 150, ystep = 30;
+  int ybottom = SYSIZE - 20;
+
+  ClearWindow();
+  DrawHeadline();
+
+  DrawTextFCentered(100, FC_GREEN, "Program information:");
+
+  DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
+		    "This game is Freeware!");
+  DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW,
+		    "If you like it, send e-mail to:");
+  DrawTextFCentered(ystart + 2 * ystep, FC_RED,
+		    "aeglos@valinor.owl.de");
+  DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW,
+		    "or SnailMail to:");
+  DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED,
+		    "Holger Schemel");
+  DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED,
+		    "Oststrasse 11a");
+  DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED,
+		    "33604 Bielefeld");
+  DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED,
+		    "Germany");
+
+  DrawTextFCentered(ystart + 7 * ystep, FC_YELLOW,
+		    "If you have created new levels,");
+  DrawTextFCentered(ystart + 8 * ystep, FC_YELLOW,
+		    "send them to me to include them!");
+  DrawTextFCentered(ystart + 9 * ystep, FC_YELLOW,
+		    ":-)");
+
+  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for main menu");
 }
 
 void DrawHelpScreen()
@@ -635,7 +656,7 @@ void DrawHelpScreen()
 
 void HandleHelpScreen(int button)
 {
-  static long hs_delay = 0;
+  static unsigned long hs_delay = 0;
   int num_helpscreen_els_pages =
     (num_helpscreen_els + MAX_HELPSCREEN_ELS-1) / MAX_HELPSCREEN_ELS;
   int button_released = !button;
@@ -643,7 +664,7 @@ void HandleHelpScreen(int button)
 
   if (button_released)
   {
-    if (helpscreen_state<num_helpscreen_els_pages-1)
+    if (helpscreen_state < num_helpscreen_els_pages - 1)
     {
       for(i=0;i<MAX_HELPSCREEN_ELS;i++)
 	helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
@@ -651,16 +672,21 @@ void HandleHelpScreen(int button)
       DrawHelpScreenElText(helpscreen_state*MAX_HELPSCREEN_ELS);
       DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
     }
-    else if (helpscreen_state<num_helpscreen_els_pages+num_bg_loops-1)
+    else if (helpscreen_state < num_helpscreen_els_pages + num_bg_loops - 1)
     {
       helpscreen_state++;
-      DrawHelpScreenMusicText(helpscreen_state-num_helpscreen_els_pages);
+      DrawHelpScreenMusicText(helpscreen_state - num_helpscreen_els_pages);
     }
-    else if (helpscreen_state==num_helpscreen_els_pages+num_bg_loops-1)
+    else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops - 1)
     {
       helpscreen_state++;
       DrawHelpScreenCreditsText();
     }
+    else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops)
+    {
+      helpscreen_state++;
+      DrawHelpScreenContactText();
+    }
     else
     {
       FadeSounds();
@@ -681,113 +707,129 @@ 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;
-  unsigned char ascii;
 
   if (newxpos)
   {
     xpos = newxpos;
-    DrawText(SX+6*32, SY+ypos*32, local_player->alias_name, FS_BIG, FC_YELLOW);
-    DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT);
+    DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW);
+    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
     return;
   }
 
-#ifndef MSDOS
-  if ((key>=XK_A && key<=XK_Z) || (key>=XK_a && key<=XK_z && 
-      xpos<MAX_NAMELEN-1))
-  {
-    if (key>=XK_A && key<=XK_Z)
-      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)
+  if (((key >= XK_A && key <= XK_Z) || (key >= XK_a && key <= XK_z)) && 
+      xpos < MAX_NAMELEN - 1)
   {
-#endif
-    local_player->alias_name[xpos] = ascii;
-    local_player->alias_name[xpos+1] = 0;
+    char ascii;
+
+    if (key >= XK_A && key <= XK_Z)
+      ascii = 'A' + (char)(key - XK_A);
+    else
+      ascii = 'a' + (char)(key - XK_a);
+
+    setup.player_name[xpos] = ascii;
+    setup.player_name[xpos + 1] = 0;
     xpos++;
-    DrawTextExt(drawto,gc,SX+6*32,SY+ypos*32,
-		local_player->alias_name,FS_BIG,FC_YELLOW);
-    DrawTextExt(window,gc,SX+6*32,SY+ypos*32,
-		local_player->alias_name,FS_BIG,FC_YELLOW);
-    DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT);
+    DrawTextExt(drawto, gc, SX + 6*32, SY + ypos*32,
+		setup.player_name, FS_BIG, FC_YELLOW);
+    DrawTextExt(window, gc, SX + 6*32, SY + ypos*32,
+		setup.player_name, FS_BIG, FC_YELLOW);
+    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
   }
-  else if ((key==XK_Delete || key==XK_BackSpace) && xpos>0)
+  else if ((key == XK_Delete || key == XK_BackSpace) && xpos > 0)
   {
     xpos--;
-    local_player->alias_name[xpos] = 0;
-    DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT);
-    DrawGraphic(xpos+7,ypos,GFX_LEERRAUM);
+    setup.player_name[xpos] = 0;
+    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+    DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM);
   }
-  else if (key==XK_Return && xpos>0)
+  else if (key == XK_Return && xpos > 0)
   {
-    DrawText(SX+6*32,SY+ypos*32,local_player->alias_name,FS_BIG,FC_RED);
-    DrawGraphic(xpos+6,ypos,GFX_LEERRAUM);
-    SavePlayerInfo(PLAYER_SETUP);
-    CheckCheat();
+    DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED);
+    DrawGraphic(xpos + 6, ypos, GFX_LEERRAUM);
 
+    SaveSetup();
     game_status = MAINMENU;
-/*
-    DrawMainMenu();
-*/
-
   }
+
   BackToFront();
 }
 
 void DrawChooseLevel()
 {
-  int i;
-
   CloseDoor(DOOR_CLOSE_2);
 
+  FadeToFront();
+  InitAnimation();
+  HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE);
+}
+
+static void drawChooseLevelList(int first_entry, int num_page_entries)
+{
+  int i;
+  char buffer[SCR_FIELDX];
+
   ClearWindow();
-  DrawText(SX,SY,"Level Directories",FS_BIG,FC_GREEN);
-  for(i=0;i<num_leveldirs;i++)
+  DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN);
+
+  for(i=0; i<num_page_entries; i++)
   {
-    DrawText(SX+32,SY+(i+2)*32,leveldir[i].name,FS_BIG,FC_YELLOW);
-    DrawGraphic(0,i+2,GFX_KUGEL_BLAU);
+    strncpy(buffer, leveldir[first_entry + i].name , SCR_FIELDX - 1);
+    buffer[SCR_FIELDX - 1] = '\0';
+    DrawText(SX + 32, SY + (i + 2) * 32, buffer, FS_BIG, FC_YELLOW);
+    DrawGraphic(0, i + 2, GFX_KUGEL_BLAU);
   }
 
-  FadeToFront();
-  InitAnimation();
-  HandleChooseLevel(0,0,0,0,MB_MENU_INITIALIZE);
+  if (first_entry > 0)
+    DrawGraphic(0, 1, GFX_PFEIL_O);
+
+  if (first_entry + num_page_entries < num_leveldirs)
+    DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_U);
+}
+
+static void drawChooseLevelInfo(int leveldir_nr)
+{
+  XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32);
+  DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
+		    leveldir[leveldir_nr].levels,
+		    leveldir[leveldir_nr].readonly ? "readonly" : "writable");
 }
 
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 3;
+  static int first_entry = 0;
+  static unsigned long choose_delay = 0;
   static int redraw = TRUE;
-  int x = (mx+32-SX)/32, y = (my+32-SY)/32;
+  int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int num_page_entries;
+
+  if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
+    num_page_entries = num_leveldirs;
+  else
+    num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1;
 
   if (button == MB_MENU_INITIALIZE)
   {
     redraw = TRUE;
-    choice = leveldir_nr + 3;
+    choice = leveldir_nr + 3 - first_entry;
+
+    if (choice > num_page_entries + 2)
+    {
+      choice = num_page_entries + 2;
+      first_entry = num_leveldirs - num_page_entries;
+    }
+
+    drawChooseLevelList(first_entry, num_page_entries);
+    drawChooseLevelInfo(leveldir_nr);
   }
 
   if (redraw)
   {
-    DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
+    DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
     redraw = FALSE;
   }
 
@@ -799,15 +841,47 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     if (dy)
     {
       x = 1;
-      y = choice+dy;
+      y = choice + dy;
     }
     else
       x = y = 0;
+  }
 
-    if (y<3)
-      y = 3;
-    else if (y>num_leveldirs+2)
-      y = num_leveldirs+2;
+  if (x == 1 && y == 2)
+  {
+    if (first_entry > 0 &&
+	(dy || DelayReached(&choose_delay, 150)))
+    {
+#if 0
+      first_entry--;
+#else
+      first_entry -= step;
+      if (first_entry < 0)
+	first_entry = 0;
+#endif
+      drawChooseLevelList(first_entry, num_page_entries);
+      drawChooseLevelInfo(first_entry);
+      DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+      return;
+    }
+  }
+  else if (x == 1 && y > num_page_entries + 2)
+  {
+    if (first_entry + num_page_entries < num_leveldirs &&
+	(dy || DelayReached(&choose_delay, 150)))
+    {
+#if 0
+      first_entry++;
+#else
+      first_entry += step;
+      if (first_entry + num_page_entries > num_leveldirs)
+	first_entry = num_leveldirs - num_page_entries;
+#endif
+      drawChooseLevelList(first_entry, num_page_entries);
+      drawChooseLevelInfo(first_entry + num_page_entries - 1);
+      DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+      return;
+    }
   }
 
   if (!mx && !my && !dx && !dy)
@@ -816,60 +890,62 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     y = choice;
   }
 
-  if (x==1 && y>=3 && y<=num_leveldirs+2)
+  if (x == 1 && y >= 3 && y <= num_page_entries + 2)
   {
     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);
+	drawChooseLevelInfo(first_entry + y - 3);
+	choice = y;
       }
-      choice = y;
     }
     else
     {
-      local_player->leveldir_nr = leveldir_nr = y-3;
-      LoadPlayerInfo(PLAYER_LEVEL);
-      SavePlayerInfo(PLAYER_SETUP);
-      CheckCheat();
+      leveldir_nr = first_entry + y - 3;
+      level_nr =
+	getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename);
 
+      SaveLevelSetup();
       TapeErase();
-      LoadLevelTape(level_nr);
 
       game_status = MAINMENU;
       DrawMainMenu();
       redraw = TRUE;
     }
   }
+
   BackToFront();
 
-  if (game_status==CHOOSELEVEL)
+  if (game_status == CHOOSELEVEL)
     DoAnimation();
 }
 
-void DrawHallOfFame(int pos)
+void DrawHallOfFame(int highlight_position)
 {
-  int y;
-  char txt[40];
+  int i;
 
   CloseDoor(DOOR_CLOSE_2);
 
-  if (pos<0) 
+  if (highlight_position < 0) 
     LoadScore(level_nr);
+
   ClearWindow();
-  DrawText(SX+64,SY+10,"Hall Of Fame",FS_BIG,FC_YELLOW);
-  sprintf(txt,"HighScores of Level %d",level_nr);
-  DrawText(SX+256-strlen(txt)*7,SY+48,txt,FS_SMALL,FC_RED);
-  for(y=0;y<MAX_SCORE_ENTRIES;y++)
+
+  DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW);
+  DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr);
+
+  for(i=0; i<MAX_LEVEL_SERIES_ON_SCREEN; i++)
   {
-    DrawText(SX,SY+64+y*32,".................",FS_BIG,
-	     (y==pos ? FC_RED : FC_GREEN));
-    DrawText(SX,SY+64+y*32,highscore[y].Name,FS_BIG,
-	     (y==pos ? FC_RED : FC_GREEN));
-    DrawText(SX+12*32,SY+64+y*32,
-	     int2str(highscore[y].Score,5),FS_BIG,
-	     (y==pos ? FC_RED : FC_GREEN));
+    DrawText(SX, SY + 64 + i * 32, ".................", FS_BIG,
+	     (i == highlight_position ? FC_RED : FC_GREEN));
+    DrawText(SX, SY + 64 + i * 32, highscore[i].Name, FS_BIG,
+	     (i == highlight_position ? FC_RED : FC_GREEN));
+    DrawText(SX + 12 * 32, SY + 64 + i * 32,
+	     int2str(highscore[i].Score, 5), FS_BIG,
+	     (i == highlight_position ? FC_RED : FC_GREEN));
   }
 
   FadeToFront();
@@ -897,26 +973,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 +1005,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 +1087,134 @@ 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 0
+	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
+	DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+	setup.double_buffering = TRUE;
+	setup.direct_draw = !setup.double_buffering;
+#endif
       }
       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;
-      }
-      else if (y==13)
-      {
-	game_status = SETUPINPUT;
-	DrawSetupInputScreen();
-	redraw = TRUE;
+	setup.autorecord = !setup.autorecord;
       }
-
-#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();
+	  */
+
+#ifdef MSDOS
+	  save_joystick_data(JOYSTICK_FILENAME);
+#endif
+
+
 	}
 
 	game_status = MAINMENU;
@@ -1154,90 +1231,123 @@ 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);
+
+  DrawTextFCentered(SYSIZE - 20, FC_BLUE,
+		    "Joysticks deactivated on this screen");
+
+  HandleSetupInputScreen(0,0, 0,0, MB_MENU_INITIALIZE);
+  FadeToFront();
+  InitAnimation();
+}
+
+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
+    strncpy(device_name, joystick_device_name[device_nr], strlen(device_name));
+}
+
+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 +1356,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 +1372,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 +1406,113 @@ 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 unsigned 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 (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 (y == 4)
       {
-	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();
+	  game_status = CALIBRATION;
+	  CalibrateJoystick(player_nr);
+	  game_status = SETUPINPUT;
 	}
+	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 +1531,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 +1546,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 +1570,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 +1584,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 +1595,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 +1609,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 +1631,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;
@@ -1578,29 +1651,43 @@ void CalibrateJoystick()
   } joy_ctrl;
 #endif
 
-#ifdef MSDOS
-  char joy_nr[4];
-#endif
-
-  int joystick_nr = setup.joy_input[0].joystick_nr;
+#ifndef MSDOS
   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;
+#else
+  int calibration_step = 1;
+#endif
+
+  int joystick_fd = stored_player[player_nr].joystick_fd;
   int x, y, last_x, last_y, xpos = 8, ypos = 3;
   boolean check[3][3];
-  int check_remaining = 3 * 3;
-  int joy;
+  int check_remaining;
+  int joy_value;
   int result = -1;
 
-  if (joystick_status == JOYSTICK_OFF)
-    return;
+  if (joystick_status == JOYSTICK_OFF ||
+      joystick_fd < 0 ||
+      !setup.input[player_nr].use_joystick)
+    goto error_out;
 
   ClearWindow();
-  DrawText(SX,      SY +  6*32, " ROTATE JOYSTICK ",FS_BIG,FC_YELLOW);
-  DrawText(SX,      SY +  7*32, "IN ALL DIRECTIONS",FS_BIG,FC_YELLOW);
-  DrawText(SX + 16, SY +  9*32, "  IF ALL BALLS  ",FS_BIG,FC_YELLOW);
-  DrawText(SX,      SY + 10*32, "   ARE YELLOW,   ",FS_BIG,FC_YELLOW);
-  DrawText(SX,      SY + 11*32, "  PRESS BUTTON!  ",FS_BIG,FC_YELLOW);
+
+#ifndef MSDOS
+  DrawText(SX,      SY +  6*32, " ROTATE JOYSTICK ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY +  7*32, "IN ALL DIRECTIONS", FS_BIG, FC_YELLOW);
+  DrawText(SX + 16, SY +  9*32, "  IF ALL BALLS  ",  FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 10*32, "   ARE YELLOW,   ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
+  check_remaining = 3 * 3;
+#else
+  DrawText(SX,      SY +  7*32, "  MOVE JOYSTICK  ", FS_BIG, FC_YELLOW);
+  DrawText(SX + 16, SY +  8*32, "       TO       ",  FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY +  9*32, " CENTER POSITION ",  FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 10*32, "       AND       ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
+  check_remaining = 0;
+#endif
 
   for(y=0; y<3; y++)
   {
@@ -1611,9 +1698,9 @@ void CalibrateJoystick()
     }
   }
 
-  joy = Joystick();
-  last_x = (joy & JOY_LEFT ? -1 : joy & JOY_RIGHT ? +1 : 0);
-  last_y = (joy & JOY_UP   ? -1 : joy & JOY_DOWN  ? +1 : 0);
+  joy_value = Joystick(player_nr);
+  last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
+  last_y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
   DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
 
   BackToFront();
@@ -1624,7 +1711,7 @@ void CalibrateJoystick()
   joy_ctrl.buttons = 0;
 #endif
 
-  while(Joystick() & JOY_BUTTON);
+  while(Joystick(player_nr) & JOY_BUTTON);
 
   InitAnimation();
 
@@ -1666,7 +1753,8 @@ void CalibrateJoystick()
       }
     }
 
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
+#ifndef MSDOS
+    if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
     {
       joystick_status = JOYSTICK_OFF;
       goto error_out;
@@ -1682,26 +1770,68 @@ 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();
+#endif
 
-    joy = Joystick();
+    joy_value = Joystick(player_nr);
 
-    if (joy & JOY_BUTTON && check_remaining == 0)
+    if (joy_value & JOY_BUTTON && check_remaining == 0)
+    {
       result = 1;
 
-    x = (joy & JOY_LEFT ? -1 : joy & JOY_RIGHT ? +1 : 0);
-    y = (joy & JOY_UP   ? -1 : joy & JOY_DOWN  ? +1 : 0);
+#ifdef MSDOS
+      if (calibration_step == 1)
+      {
+	remove_joystick();
+	InitJoysticks();
+      }
+      else if (calibrate_joystick(joystick_fd) != 0)
+      {
+	joystick_status = JOYSTICK_OFF;
+	goto error_out;
+      }
+
+      if (joy[joystick_fd].flags & JOYFLAG_CALIBRATE)
+      {
+	calibration_step++;
+	result = -1;
+
+	DrawText(SX,      SY +  7*32, "  MOVE JOYSTICK  ", FS_BIG, FC_YELLOW);
+	DrawText(SX + 16, SY +  8*32, "       TO       ",  FS_BIG, FC_YELLOW);
+
+	if (calibration_step == 2)
+	  DrawText(SX + 16, SY + 9*32," THE UPPER LEFT ",  FS_BIG, FC_YELLOW);
+	else
+	  DrawText(SX,      SY + 9*32," THE LOWER RIGHT ", FS_BIG, FC_YELLOW);
+
+	DrawText(SX,      SY + 10*32, "       AND       ", FS_BIG, FC_YELLOW);
+	DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
+
+	BackToFront();
+
+	while(Joystick(player_nr) & JOY_BUTTON)
+	  DoAnimation();
+      }
+#endif
+    }
+
+    x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
+    y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
 
     if (x != last_x || y != last_y)
     {
+#ifndef MSDOS
       DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB);
+#else
+      DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_BLAU);
+#endif
       DrawGraphic(xpos + x,      ypos + y,      GFX_KUGEL_ROT);
 
       last_x = x;
@@ -1715,14 +1845,15 @@ 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
+
     }
 
     BackToFront();
@@ -1734,20 +1865,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);
+  DrawText(SX + 16, SY + 6*32, "  JOYSTICK NOT  ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 7*32, "    AVAILABLE    ", FS_BIG, FC_YELLOW);
   BackToFront();
-  Delay(3000);
-  DrawSetupScreen();
+  Delay(2000);
+  DrawSetupInputScreen();
 }
 
+
+
+#if 0
+
 void CalibrateJoystick_OLD()
 {
 #ifdef __FreeBSD__
@@ -1765,7 +1900,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 +1994,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 +2055,11 @@ void CalibrateJoystick_OLD()
   DrawSetupScreen();
 }
 
-void HandleGameActions(byte player_action)
+#endif
+
+
+
+void HandleGameActions()
 {
   if (game_status != PLAYING)
     return;
@@ -1931,7 +2070,7 @@ void HandleGameActions(byte player_action)
   if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
     TapeStop();
 
-  GameActions(player_action);
+  GameActions();
 
   BackToFront();
 }
@@ -1947,14 +2086,14 @@ void HandleVideoButtons(int mx, int my, int button)
       TapeStop();
       if (TAPE_IS_EMPTY(tape))
       {
-	LoadLevelTape(level_nr);
+	LoadTape(level_nr);
 	if (TAPE_IS_EMPTY(tape))
 	  Request("No tape for this level !",REQ_CONFIRM);
       }
       else
       {
 	if (tape.changed)
-	  SaveLevelTape(tape.level_nr);
+	  SaveTape(tape.level_nr);
 	TapeErase();
       }
       DrawCompleteVideoDisplay();
@@ -1973,9 +2112,11 @@ void HandleVideoButtons(int mx, int my, int button)
       {
 	TapeStartRecording();
 
+#ifndef MSDOS
 	if (options.network)
 	  SendToServer_StartPlaying();
 	else
+#endif
 	{
 	  game_status = PLAYING;
 	  InitGame();
@@ -2020,13 +2161,13 @@ void HandleVideoButtons(int mx, int my, int button)
 	else if (!tape.pause_before_death)	/* FFWD PLAY -> + AUTO PAUSE */
 	{
 	  tape.pause_before_death = TRUE;
-	  DrawVideoDisplay(VIDEO_STATE_PAUSE_ON, VIDEO_DISPLAY_LABEL_ONLY);
+	  DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
 	}
 	else					/* -> NORMAL PLAY */
 	{
 	  tape.fast_forward = FALSE;
 	  tape.pause_before_death = FALSE;
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PAUSE_OFF, 0);
+	  DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_OFF, 0);
 	}
       }
       break;
@@ -2046,17 +2187,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 +2204,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 +2219,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
@@ -2124,9 +2259,11 @@ void HandleGameButtons(int mx, int my, int button)
       if (Request("Do you really want to quit the game ?",
 		  REQ_ASK | REQ_STAY_CLOSED))
       { 
+#ifndef MSDOS
 	if (options.network)
 	  SendToServer_StopPlaying();
 	else
+#endif
 	{
 	  game_status = MAINMENU;
 	  DrawMainMenu();
@@ -2139,45 +2276,25 @@ void HandleGameButtons(int mx, int my, int button)
     case BUTTON_GAME_PAUSE:
       if (options.network)
       {
+#ifndef MSDOS
 	if (tape.pausing)
 	  SendToServer_ContinuePlaying();
 	else
 	  SendToServer_PausePlaying();
+#endif
       }
       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:
       if (tape.pausing)
       {
+#ifndef MSDOS
 	if (options.network)
 	  SendToServer_ContinuePlaying();
 	else
+#endif
 	{
 	  tape.pausing = FALSE;
 	  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);