From 07e47c9cc4c619ab000b1dd8d8b318eaf5bae3b3 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sun, 24 Nov 2013 14:05:57 +0100 Subject: [PATCH] rocksndiamonds-3.3.1.2 * version 3.3.1.2 released --- ChangeLog | 3 +++ src/Makefile | 2 +- src/conftime.h | 2 +- src/init.c | 3 ++- src/libgame/misc.c | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65c1b093..2469c878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2013-11-24 + * version 3.3.1.2 released + 2013-11-20 * improved error handling: display error message on screen (not only in the error file or on the console), and display path of the error file diff --git a/src/Makefile b/src/Makefile index b8c53054..a67cd14c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -146,7 +146,7 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR) CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL) CONFIG = $(CONFIG_GAME) $(JOYSTICK) -DEBUG = -DDEBUG -g +# DEBUG = -DDEBUG -g # PROFILING = $(PROFILING_FLAGS) # OPTIONS = $(DEBUG) -Wall # only for debugging purposes diff --git a/src/conftime.h b/src/conftime.h index 04d6ca99..fd1449b6 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2013-11-20 00:53" +#define COMPILE_DATE_STRING "2013-11-24 14:05" diff --git a/src/init.c b/src/init.c index b1e9920e..a7ad871b 100644 --- a/src/init.c +++ b/src/init.c @@ -6498,7 +6498,8 @@ void CloseAllAndExit(int exit_value) SaveLevelSetup_LastSeries_Deactivate(); /* tell user where to find error log file which may contain more details */ - NotifyUserAboutErrorFile(); + // (error notification now directly displayed on screen inside R'n'D + // NotifyUserAboutErrorFile(); /* currently only works for Windows */ } exit(exit_value); diff --git a/src/libgame/misc.c b/src/libgame/misc.c index b70545be..c196fe81 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -754,7 +754,7 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) #if 1 /* if the program is configured to start from current directory (default), determine program package directory from program binary (some versions - of KDE/Konqueror and Mac OS X (especially "Maverick") apparently do not + of KDE/Konqueror and Mac OS X (especially "Mavericks") apparently do not set the current working directory to the program package directory) */ if (strEqual(ro_base_path, ".")) -- 2.34.1