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 76bf7075a5bacc319c48a9865dd1a75e38958591..d4aeb0434fbd1fb9f8667aebeca6cc27919acbf9 100644 (file)
--- 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 5fb78a8ee80d78e113e368cad53298ee69fb88e1..5143d8c1ce6750c0c51fdb1e84d5542751341d2e 100644 (file)
--- 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 ca46ab7ada74a0fdbd987e0e6f7c18cc176737e1..538c451c55863a85b87a08bccd80e27971598d11 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2005 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------

diff --git a/src/Makefile b/src/Makefile
index aea2a2a7dc1ec5b7b2c1093146107dc23d0ff440..286a5c9a0676af2a26e8cb13d1fd2dcda954741b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile (src)
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2005 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------

diff --git a/src/conftime.h b/src/conftime.h
index a82deeada2c2424a3b9abec96536644ade0cf24e..b96b8ac511124de3bd248f95efc0957d810e6f67 100644 (file)
--- 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 876cb3458f867bfdb2902985618e118ce5cca940..aec69d091a181b622e9c068441192bc77a5534d9 100644 (file)
--- 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 <info@artsoft.org>
+# (c) 1995-2005 Holger Schemel <info@artsoft.org>
 # -----------------------------------------------------------------------------
 # Emerald Mine for X11 © 2000,2001 David Tritscher
 # =============================================================================

diff --git a/src/libgame/Makefile b/src/libgame/Makefile
index 4d5b28c6b3eae4baadc7ddfe80b82ab7b7e874da..497fb24e79e6f0bb0a9ba33dd93e40b780d3e528 100644 (file)
--- a/src/libgame/Makefile
+++ b/src/libgame/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile (libgame)
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2005 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 8d8f8aae9ce92700e95e162f7003688a12586081..3881d202338a5d3ab1971a35cf080fab644b2241 100644 (file)
--- 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;