From: Holger Schemel Date: Sun, 7 Aug 2005 02:51:27 +0000 (+0200) Subject: rnd-20050807-2-src X-Git-Tag: 3.1.1^2~2 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=6413b637e99f65b72fa0bbb007e6dc4dd03196d1;p=rocksndiamonds.git rnd-20050807-2-src * version number temporarily set to 3.1.1 (intermediate bugfix release) * version 3.1.1 released --- diff --git a/CHANGES b/CHANGES index 76bf7075..d4aeb043 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,12 @@ -Release Version 3.2.0 [?? ??? ????] +Release Version 3.1.1 [07 AUG 2005] ----------------------------------- - added tutorial level set created by Aaron Davidson - added editor element descriptions written by Aaron Davidson + - added native game engine for Emerald Mine (Club) levels + - added level skipping functionality to main menu + - added support for dumping small-sized level sketches from editor + - added use of "editorsetup.conf" for different level sets + - lots of bugfixes and internal engine changes (see ChangeLog) Release Version 3.1.0 [07 JUN 2004] ----------------------------------- diff --git a/ChangeLog b/ChangeLog index 5fb78a8e..5143d8c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-08-07 + * version number temporarily set to 3.1.1 (intermediate bugfix release) + * version 3.1.1 released + 2005-08-07 * changed some va_arg() arguments from 'long' to 'int', fixing problems on 64-bit architecture systems with LP64 data model diff --git a/Makefile b/Makefile index ca46ab7a..538c451c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile # ----------------------------------------------------------------------------- -# (c) 1995-2003 Holger Schemel +# (c) 1995-2005 Holger Schemel # ============================================================================= # ----------------------------------------------------------------------------- diff --git a/src/Makefile b/src/Makefile index aea2a2a7..286a5c9a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile (src) # ----------------------------------------------------------------------------- -# (c) 1995-2003 Holger Schemel +# (c) 1995-2005 Holger Schemel # ============================================================================= # ----------------------------------------------------------------------------- diff --git a/src/conftime.h b/src/conftime.h index a82deead..b96b8ac5 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2005-08-07 00:47]" +#define COMPILE_DATE_STRING "[2005-08-07 01:52]" diff --git a/src/game_em/Makefile b/src/game_em/Makefile index 876cb345..aec69d09 100644 --- a/src/game_em/Makefile +++ b/src/game_em/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile (game_em) # ----------------------------------------------------------------------------- -# (c) 1995-2004 Holger Schemel +# (c) 1995-2005 Holger Schemel # ----------------------------------------------------------------------------- # Emerald Mine for X11 © 2000,2001 David Tritscher # ============================================================================= diff --git a/src/libgame/Makefile b/src/libgame/Makefile index 4d5b28c6..497fb24e 100644 --- a/src/libgame/Makefile +++ b/src/libgame/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile (libgame) # ----------------------------------------------------------------------------- -# (c) 1995-2003 Holger Schemel +# (c) 1995-2005 Holger Schemel # ============================================================================= # ----------------------------------------------------------------------------- diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 8d8f8aae..3881d202 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -578,10 +578,18 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) char *rw_base_path = RW_BASE_PATH; char **options_left = &argv[1]; +#if !defined(PLATFORM_MACOSX) + /* if the program is configured to start from current directory (default), + determine program package directory (KDE/Konqueror does not do this by + itself and fails otherwise); on Mac OS X, the program binary is stored + in an application package directory -- do not try to use this directory + as the program data directory (Mac OS X handles this correctly anyway) */ + if (strcmp(ro_base_path, ".") == 0) ro_base_path = program.command_basepath; if (strcmp(rw_base_path, ".") == 0) rw_base_path = program.command_basepath; +#endif /* initialize global program options */ options.display_name = NULL;