X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=629133e8e61451eecb2b347069aff99590931d57;hb=cccf7a885aab5d50f050fead64cc56e1edfab5d6;hp=e54a016b4542caf01148424f68d24eb5cf96f529;hpb=4e745044fe35b4b093b1490a6e3da0fe4ee512de;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index e54a016b..629133e8 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1369,6 +1369,10 @@ static void InitGraphicInfo()
   static int full_size_graphics[] =
   {
     IMG_GLOBAL_BORDER,
+    IMG_GLOBAL_BORDER_MAIN,
+    IMG_GLOBAL_BORDER_SCORES,
+    IMG_GLOBAL_BORDER_EDITOR,
+    IMG_GLOBAL_BORDER_PLAYING,
     IMG_GLOBAL_DOOR,
 
     IMG_BACKGROUND_ENVELOPE_1,
@@ -4549,8 +4553,6 @@ static void InitGlobal()
   global.create_images_dir = NULL;
 
   global.frames_per_second = 0;
-  global.fps_slowdown = FALSE;
-  global.fps_slowdown_factor = 1;
 
   global.border_status = GAME_MODE_MAIN;
 
@@ -4563,57 +4565,57 @@ void Execute_Command(char *command)
 
   if (strEqual(command, "print graphicsinfo.conf"))
   {
-    printf("# You can configure additional/alternative image files here.\n");
-    printf("# (The entries below are default and therefore commented out.)\n");
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("name", "Classic Graphics"));
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
-    printf("\n");
+    Print("# You can configure additional/alternative image files here.\n");
+    Print("# (The entries below are default and therefore commented out.)\n");
+    Print("\n");
+    Print("%s\n", getFormattedSetupEntry("name", "Classic Graphics"));
+    Print("\n");
+    Print("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    Print("\n");
 
     for (i = 0; image_config[i].token != NULL; i++)
-      printf("# %s\n", getFormattedSetupEntry(image_config[i].token,
-					      image_config[i].value));
+      Print("# %s\n", getFormattedSetupEntry(image_config[i].token,
+					     image_config[i].value));
 
     exit(0);
   }
   else if (strEqual(command, "print soundsinfo.conf"))
   {
-    printf("# You can configure additional/alternative sound files here.\n");
-    printf("# (The entries below are default and therefore commented out.)\n");
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("name", "Classic Sounds"));
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
-    printf("\n");
+    Print("# You can configure additional/alternative sound files here.\n");
+    Print("# (The entries below are default and therefore commented out.)\n");
+    Print("\n");
+    Print("%s\n", getFormattedSetupEntry("name", "Classic Sounds"));
+    Print("\n");
+    Print("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    Print("\n");
 
     for (i = 0; sound_config[i].token != NULL; i++)
-      printf("# %s\n", getFormattedSetupEntry(sound_config[i].token,
-					      sound_config[i].value));
+      Print("# %s\n", getFormattedSetupEntry(sound_config[i].token,
+					     sound_config[i].value));
 
     exit(0);
   }
   else if (strEqual(command, "print musicinfo.conf"))
   {
-    printf("# You can configure additional/alternative music files here.\n");
-    printf("# (The entries below are default and therefore commented out.)\n");
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("name", "Classic Music"));
-    printf("\n");
-    printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
-    printf("\n");
+    Print("# You can configure additional/alternative music files here.\n");
+    Print("# (The entries below are default and therefore commented out.)\n");
+    Print("\n");
+    Print("%s\n", getFormattedSetupEntry("name", "Classic Music"));
+    Print("\n");
+    Print("%s\n", getFormattedSetupEntry("sort_priority", "100"));
+    Print("\n");
 
     for (i = 0; music_config[i].token != NULL; i++)
-      printf("# %s\n", getFormattedSetupEntry(music_config[i].token,
-					      music_config[i].value));
+      Print("# %s\n", getFormattedSetupEntry(music_config[i].token,
+					     music_config[i].value));
 
     exit(0);
   }
   else if (strEqual(command, "print editorsetup.conf"))
   {
-    printf("# You can configure your personal editor element list here.\n");
-    printf("# (The entries below are default and therefore commented out.)\n");
-    printf("\n");
+    Print("# You can configure your personal editor element list here.\n");
+    Print("# (The entries below are default and therefore commented out.)\n");
+    Print("\n");
 
     /* this is needed to be able to check element list for cascade elements */
     InitElementPropertiesStatic();
@@ -4625,30 +4627,30 @@ void Execute_Command(char *command)
   }
   else if (strEqual(command, "print helpanim.conf"))
   {
-    printf("# You can configure different element help animations here.\n");
-    printf("# (The entries below are default and therefore commented out.)\n");
-    printf("\n");
+    Print("# You can configure different element help animations here.\n");
+    Print("# (The entries below are default and therefore commented out.)\n");
+    Print("\n");
 
     for (i = 0; helpanim_config[i].token != NULL; i++)
     {
-      printf("# %s\n", getFormattedSetupEntry(helpanim_config[i].token,
-					      helpanim_config[i].value));
+      Print("# %s\n", getFormattedSetupEntry(helpanim_config[i].token,
+					     helpanim_config[i].value));
 
       if (strEqual(helpanim_config[i].token, "end"))
-	printf("#\n");
+	Print("#\n");
     }
 
     exit(0);
   }
   else if (strEqual(command, "print helptext.conf"))
   {
-    printf("# You can configure different element help text here.\n");
-    printf("# (The entries below are default and therefore commented out.)\n");
-    printf("\n");
+    Print("# You can configure different element help text here.\n");
+    Print("# (The entries below are default and therefore commented out.)\n");
+    Print("\n");
 
     for (i = 0; helptext_config[i].token != NULL; i++)
-      printf("# %s\n", getFormattedSetupEntry(helptext_config[i].token,
-					      helptext_config[i].value));
+      Print("# %s\n", getFormattedSetupEntry(helptext_config[i].token,
+					     helptext_config[i].value));
 
     exit(0);
   }
@@ -4752,7 +4754,7 @@ void Execute_Command(char *command)
     // check if there are any displays available
     if (num_displays < 0)
     {
-      printf("No displays available: %s\n", SDL_GetError());
+      Print("No displays available: %s\n", SDL_GetError());
 
       exit(-1);
     }
@@ -4762,13 +4764,13 @@ void Execute_Command(char *command)
       int num_modes = SDL_GetNumDisplayModes(i);
       int j;
 
-      printf("Available display modes for display %d:\n", i);
+      Print("Available display modes for display %d:\n", i);
 
       // check if there are any display modes available for this display
       if (num_modes < 0)
       {
-	printf("No display modes available for display %d: %s\n",
-	       i, SDL_GetError());
+	Print("No display modes available for display %d: %s\n",
+	      i, SDL_GetError());
 
 	exit(-1);
       }
@@ -4779,13 +4781,13 @@ void Execute_Command(char *command)
 
 	if (SDL_GetDisplayMode(i, j, &mode) < 0)
 	{
-	  printf("Cannot get display mode %d for display %d: %s\n",
-		 j, i, SDL_GetError());
+	  Print("Cannot get display mode %d for display %d: %s\n",
+		j, i, SDL_GetError());
 
 	  exit(-1);
 	}
 
-	printf("- %d x %d\n", mode.w, mode.h);
+	Print("- %d x %d\n", mode.w, mode.h);
       }
     }
 
@@ -4805,7 +4807,7 @@ void Execute_Command(char *command)
     /* check if there are any modes available */
     if (modes == NULL)
     {
-      printf("No modes available!\n");
+      Print("No modes available!\n");
 
       exit(-1);
     }
@@ -4813,14 +4815,14 @@ void Execute_Command(char *command)
     /* check if our resolution is restricted */
     if (modes == (SDL_Rect **)-1)
     {
-      printf("All resolutions available.\n");
+      Print("All resolutions available.\n");
     }
     else
     {
-      printf("Available display modes:\n");
+      Print("Available display modes:\n");
 
       for (i = 0; modes[i]; i++)
-	printf("- %d x %d\n", modes[i]->w, modes[i]->h);
+	Print("- %d x %d\n", modes[i]->w, modes[i]->h);
     }
 
     exit(0);
@@ -5000,9 +5002,21 @@ static void InitMixer()
 
 void InitGfxBuffers()
 {
+  static int win_xsize_last = -1;
+  static int win_ysize_last = -1;
+
   /* create additional image buffers for double-buffering and cross-fading */
-  ReCreateBitmap(&bitmap_db_store, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
-  ReCreateBitmap(&bitmap_db_cross, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
+
+  if (WIN_XSIZE != win_xsize_last || WIN_YSIZE != win_ysize_last)
+  {
+    /* may contain content for cross-fading -- only re-create if changed */
+    ReCreateBitmap(&bitmap_db_store, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
+    ReCreateBitmap(&bitmap_db_cross, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
+
+    win_xsize_last = WIN_XSIZE;
+    win_ysize_last = WIN_YSIZE;
+  }
+
   ReCreateBitmap(&bitmap_db_field, FXSIZE, FYSIZE, DEFAULT_DEPTH);
   ReCreateBitmap(&bitmap_db_panel, DXSIZE, DYSIZE, DEFAULT_DEPTH);
   ReCreateBitmap(&bitmap_db_door_1, 3 * DXSIZE, DYSIZE, DEFAULT_DEPTH);
@@ -5188,27 +5202,13 @@ void InitGfx()
   init_last = init;
 }
 
-void RedrawGlobalBorder()
-{
-  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
-	     0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-
-  redraw_mask = REDRAW_ALL;
-}
-
 void InitGfxBackground()
 {
-  int x, y;
-
   fieldbuffer = bitmap_db_field;
   SetDrawtoField(DRAW_BACKBUFFER);
 
   ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-  for (x = 0; x < MAX_BUF_XSIZE; x++)
-    for (y = 0; y < MAX_BUF_YSIZE; y++)
-      redraw[x][y] = 0;
-  redraw_tiles = 0;
   redraw_mask = REDRAW_ALL;
 }
 
@@ -5666,7 +5666,7 @@ void DisplayExitMessage(char *format, va_list ap)
   sy += 3 * font_height;
 
   num_lines_printed =
-    DrawTextBuffer(sx, sy, program.error_filename, font_2,
+    DrawTextBuffer(sx, sy, program.log_filename[LOG_ERR_ID], font_2,
 		   line_length, line_length, max_lines,
 		   0, BLIT_ON_BACKGROUND, TRUE, TRUE, FALSE);