X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=f0d73e7311e9e102686a56319b8c4ce59e4f7df9;hb=f47abfa991814f09bfc5e388f284663bd23e2829;hp=9484cbd2e5b5840c5b8f10083f575676885d217b;hpb=76ae1ac5119938169d8201d94bd44fedaa4e298b;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 9484cbd2..f0d73e73 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -44,11 +44,6 @@ int			level_nr;
 
 struct LevelStats	level_stats[MAX_LEVELS];
 
-Display		       *display = NULL;
-Visual		       *visual = NULL;
-int			screen = 0;
-Colormap		cmap = None;
-
 DrawWindow	       *window = NULL;
 DrawBuffer	       *backbuffer = NULL;
 DrawBuffer	       *drawto = NULL;
@@ -60,7 +55,6 @@ boolean			keyrepeat_status = TRUE;
 #endif
 
 int			redraw_mask = REDRAW_NONE;
-int			redraw_tiles = 0;
 
 int			FrameCounter = 0;
 
@@ -69,15 +63,17 @@ int			FrameCounter = 0;
 /* init/close functions                                                      */
 /* ========================================================================= */
 
-void InitProgramInfo(char *argv0,
+void InitProgramInfo(char *argv0, char *config_filename,
 		     char *userdata_subdir, char *userdata_subdir_unix,
 		     char *program_title, char *icon_title,
-		     char *sdl_icon_filename, char *cookie_prefix,
+		     char *icon_filename, char *cookie_prefix,
 		     int program_version)
 {
   program.command_basepath = getBasePath(argv0);
   program.command_basename = getBaseName(argv0);
 
+  program.config_filename = config_filename;
+
   program.userdata_subdir = userdata_subdir;
   program.userdata_subdir_unix = userdata_subdir_unix;
   program.userdata_path = getUserGameDataDir();
@@ -86,7 +82,7 @@ void InitProgramInfo(char *argv0,
   program.window_title = "(undefined)";
   program.icon_title = icon_title;
 
-  program.sdl_icon_filename = sdl_icon_filename;
+  program.icon_filename = icon_filename;
 
   program.cookie_prefix = cookie_prefix;
 
@@ -96,8 +92,10 @@ void InitProgramInfo(char *argv0,
   program.version_build = VERSION_BUILD(program_version);
   program.version_ident = program_version;
 
-  program.error_filename = getErrorFilename(ERROR_BASENAME);
-  program.error_file = stderr;
+  program.log_filename[LOG_OUT_ID] = getLogFilename(LOG_OUT_BASENAME);
+  program.log_filename[LOG_ERR_ID] = getLogFilename(LOG_ERR_BASENAME);
+  program.log_file[LOG_OUT_ID] = program.log_file_default[LOG_OUT_ID] = stdout;
+  program.log_file[LOG_ERR_ID] = program.log_file_default[LOG_ERR_ID] = stderr;
 }
 
 void SetWindowTitle()
@@ -138,7 +136,7 @@ void InitPlatformDependentStuff(void)
   updateUserGameDataDir();
 #endif
 
-  openErrorFile();
+  OpenLogFiles();
 
 #if defined(TARGET_SDL2)
   int sdl_init_flags = SDL_INIT_EVENTS      | SDL_INIT_NOPARACHUTE;
@@ -154,9 +152,7 @@ void InitPlatformDependentStuff(void)
 
 void ClosePlatformDependentStuff(void)
 {
-#if defined(PLATFORM_WIN32)
-  closeErrorFile();
-#endif
+  CloseLogFiles();
 }
 
 void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
@@ -175,6 +171,8 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
 
   gfx.field_save_buffer = field_save_buffer;
 
+  gfx.drawing_area_changed = FALSE;
+
   SetDrawDeactivationMask(REDRAW_NONE);		/* do not deactivate drawing */
   SetDrawBackgroundMask(REDRAW_NONE);		/* deactivate masked drawing */
 }
@@ -250,6 +248,11 @@ void InitGfxCustomArtworkInfo()
   gfx.draw_init_text = TRUE;
 }
 
+void InitGfxOtherSettings()
+{
+  gfx.cursor_mode = CURSOR_DEFAULT;
+}
+
 void SetDrawDeactivationMask(int draw_deactivation_mask)
 {
   gfx.draw_deactivation_mask = draw_deactivation_mask;
@@ -359,6 +362,8 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
 
   SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
 
+  video.initialized = TRUE;
+
   drawto = backbuffer;
 }
 
@@ -468,6 +473,16 @@ boolean DrawingOnBackground(int x, int y)
 	  CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
 }
 
+boolean DrawingAreaChanged()
+{
+  int drawing_area_changed = gfx.drawing_area_changed;
+
+  // reset flag for change of drawing area after querying it
+  gfx.drawing_area_changed = FALSE;
+
+  return drawing_area_changed;
+}
+
 static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y,
 				  int *width, int *height, boolean is_dest)
 {
@@ -660,14 +675,6 @@ void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y,
     ClearRectangle(bitmap, x, y, width, height);
 }
 
-void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
-{
-}
-
-void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
-{
-}
-
 void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 		      int src_x, int src_y, int width, int height,
 		      int dst_x, int dst_y)
@@ -690,8 +697,6 @@ void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 	       dst_x, dst_y);
 
     /* draw foreground */
-    SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-		  dst_x - src_x, dst_y - src_y);
     BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height,
 		     dst_x, dst_y);
   }
@@ -774,16 +779,6 @@ Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
   return GetPixelFromRGB(bitmap, color_r, color_g, color_b);
 }
 
-/* execute all pending screen drawing operations */
-void FlushDisplay(void)
-{
-}
-
-/* execute and wait for all pending screen drawing operations */
-void SyncDisplay(void)
-{
-}
-
 void KeyboardAutoRepeatOn(void)
 {
 #if defined(TARGET_SDL2)
@@ -805,11 +800,6 @@ void KeyboardAutoRepeatOff(void)
 #endif
 }
 
-boolean PointerInWindow(DrawWindow *window)
-{
-  return TRUE;
-}
-
 boolean SetVideoMode(boolean fullscreen)
 {
   return SDLSetVideoMode(&backbuffer, fullscreen);
@@ -1275,6 +1265,8 @@ void SetMouseCursor(int mode)
 		mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
 
   SDLSetMouseCursor(cursor_new);
+
+  gfx.cursor_mode = mode;
 }