projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug where player actions were incorrectly mapped in single player mode (also...
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 3bd825fd6fd36c6077ef1bc2de5b8db933b72948..b5e4f270c284fbde5d20661d1fb7322fb6b81fcd 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-63,8
+63,7
@@
int FrameCounter = 0;
/* init/close functions */
/* ========================================================================= */
/* init/close functions */
/* ========================================================================= */
-void InitProgramInfo(char *argv0, char *config_filename,
- char *userdata_subdir, char *userdata_subdir_unix,
+void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir,
char *program_title, char *icon_title,
char *icon_filename, char *cookie_prefix,
int program_version)
char *program_title, char *icon_title,
char *icon_filename, char *cookie_prefix,
int program_version)
@@
-75,7
+74,6
@@
void InitProgramInfo(char *argv0, char *config_filename,
program.config_filename = config_filename;
program.userdata_subdir = userdata_subdir;
program.config_filename = config_filename;
program.userdata_subdir = userdata_subdir;
- program.userdata_subdir_unix = userdata_subdir_unix;
program.userdata_path = getUserGameDataDir();
program.program_title = program_title;
program.userdata_path = getUserGameDataDir();
program.program_title = program_title;
@@
-120,7
+118,7
@@
void InitExitFunction(void (*exit_function)(int))
program.exit_function = exit_function;
/* set signal handlers to custom exit function */
program.exit_function = exit_function;
/* set signal handlers to custom exit function */
- signal(SIGINT, exit_function);
+
//
signal(SIGINT, exit_function);
signal(SIGTERM, exit_function);
/* set exit function to automatically cleanup SDL stuff after exit() */
signal(SIGTERM, exit_function);
/* set exit function to automatically cleanup SDL stuff after exit() */
@@
-132,10
+130,6
@@
void InitPlatformDependentStuff(void)
// this is initialized in GetOptions(), but may already be used before
options.verbose = TRUE;
// this is initialized in GetOptions(), but may already be used before
options.verbose = TRUE;
-#if defined(PLATFORM_MACOSX)
- updateUserGameDataDir();
-#endif
-
OpenLogFiles();
#if defined(TARGET_SDL2)
OpenLogFiles();
#if defined(TARGET_SDL2)
@@
-171,8
+165,6
@@
void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
gfx.field_save_buffer = field_save_buffer;
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 */
}
SetDrawDeactivationMask(REDRAW_NONE); /* do not deactivate drawing */
SetDrawBackgroundMask(REDRAW_NONE); /* deactivate masked drawing */
}
@@
-501,16
+493,6
@@
boolean DrawingOnBackground(int x, int y)
CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
}
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)
{
static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y,
int *width, int *height, boolean is_dest)
{
@@
-863,7
+845,7
@@
Bitmap *LoadCustomImage(char *basename)
Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
if ((new_bitmap = LoadImage(filename)) == NULL)
Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
if ((new_bitmap = LoadImage(filename)) == NULL)
- Error(ERR_EXIT, "LoadImage(
) failed: %s"
, GetError());
+ Error(ERR_EXIT, "LoadImage(
'%s') failed: %s", basename
, GetError());
return new_bitmap;
}
return new_bitmap;
}
@@
-890,7
+872,7
@@
void ReloadCustomImage(Bitmap *bitmap, char *basename)
if ((new_bitmap = LoadImage(filename)) == NULL)
{
if ((new_bitmap = LoadImage(filename)) == NULL)
{
- Error(ERR_WARN, "LoadImage(
) failed: %s"
, GetError());
+ Error(ERR_WARN, "LoadImage(
'%s') failed: %s", basename
, GetError());
return;
}
return;
}