X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=cb715f420688cae2f69bccc3dd841872c606e127;hb=a8b2caa1d373c84c1b3fc2f615370c2a319051ca;hp=eb550cb9406818e3951927ce27bd262067302109;hpb=6d639c557d602855b9866959445f3f5b5513d289;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index eb550cb9..cb715f42 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -60,7 +60,7 @@ void DrawHeadline()
   int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
 
   DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW);
-  DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING);
+  DrawTextFCentered(46, FC_RED, WINDOW_SUBTITLE_STRING);
 }
 
 void DrawMainMenu()
@@ -84,6 +84,12 @@ void DrawMainMenu()
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
 
+  /* needed if last screen was the setup screen and fullscreen state changed */
+  ChangeVideoModeIfNeeded();
+#ifdef TARGET_SDL
+  SetDrawtoField(DRAW_BACKBUFFER);
+#endif
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
 
@@ -327,7 +333,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	if (setup.autorecord)
 	  TapeStartRecording();
 
-#ifndef MSDOS
+#if !defined(MSDOS) && !defined(WIN32)
 	if (options.network)
 	  SendToServer_StartPlaying();
 	else
@@ -1283,7 +1289,10 @@ void DrawSetupScreen()
 #endif
     { &setup.scroll_delay,	"Scroll Delay:"	},
     { &setup.soft_scrolling,	"Soft Scroll.:"	},
+#if 0
     { &setup.fading,		"Fading:"	},
+#endif
+    { &setup.fullscreen,	"Fullscreen:"	},
     { &setup.quick_doors,	"Quick Doors:"	},
     { &setup.autorecord,	"Auto-Record:"	},
     { &setup.team_mode,		"Team-Mode:"	},
@@ -1480,6 +1489,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.soft_scrolling = !setup.soft_scrolling;
       }
+#if 0
       else if (y==8)
       {
 	if (setup.fading)
@@ -1488,6 +1498,15 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.fading = !setup.fading;
       }
+#endif
+      else if (y==8 && fullscreen_available)
+      {
+	if (setup.fullscreen)
+	  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);
+	setup.fullscreen = !setup.fullscreen;
+      }
       else if (y==9)
       {
 	if (setup.quick_doors)
@@ -1904,8 +1923,12 @@ void CustomizeKeyboard(int player_nr)
 	      break;
 	    }
 
+	    /* all keys configured -- wait for "Escape" or "Return" key */
+	    if (step_nr == 6)
+	      break;
+
 	    /* press 'Enter' to keep the existing key binding */
-	    if (key == KEY_Return || step_nr == 6)
+	    if (key == KEY_Return)
 	      key = *customize_step[step_nr].key;
 
 	    /* check if key already used */
@@ -2088,7 +2111,7 @@ void CalibrateJoystick(int player_nr)
 
 #ifndef MSDOS
 
-#ifdef USE_SDL_LIBRARY
+#ifdef USE_SDL_JOYSTICK
     joy_ctrl.x = Get_SDL_Joystick_Axis(joystick_fd, 0);
     joy_ctrl.y = Get_SDL_Joystick_Axis(joystick_fd, 1);
 #else