Merge branch 'master' into releases

diff --git a/Makefile b/Makefile
index bf09646daa34bb1b8136ea31f0cf5ecced63cba3..4a242ed022c7a4655e17a3e334bbd703eb9a54b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,9 @@ enginetestfast: all
 enginetestnew: all
        ./Scripts/make_enginetest.sh new
 
+leveltest: all
+       ./Scripts/make_enginetest.sh leveltest
+
 backup:
        ./Scripts/make_backup.sh src
 
@@ -132,6 +135,9 @@ backup_lev:
 backup_gfx:
        ./Scripts/make_backup.sh gfx
 
+# prerelease:
+#      ./Scripts/make_prerelease.sh
+
 dist-unix:
        ./Scripts/make_dist.sh unix .
 

diff --git a/src/conftime.h b/src/conftime.h
index d3021871bce22ecfbfefc29523fc0442d2a19976..06aa9f53c3b190039ad583c41327b56152bf20b4 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-08-16 00:08]"
+#define COMPILE_DATE_STRING "[2006-01-11 22:26]"

diff --git a/src/editor.c b/src/editor.c
index f4b017cc724e5385409ac8d2a990833d57e8518b..8c1302cc0232b150bc5c004b6bccd13bbd16df36 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -2768,14 +2768,14 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_WALL_11,
   EL_EMC_WALL_12,
 
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_EMC_ANDROID,
 #endif
   EL_BALLOON,
   EL_BALLOON_SWITCH_ANY,
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_BALLOON_SWITCH_NONE,
@@ -2788,7 +2788,7 @@ static int editor_el_emerald_mine_club[] =
 
   EL_EMC_GRASS,
   EL_EMC_PLANT,
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
   EL_EMPTY,
 #else
@@ -2796,7 +2796,7 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_MAGNIFIER,
 #endif
 
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
   EL_EMPTY,
 #else
@@ -2804,13 +2804,13 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_MAGIC_BALL_SWITCH,
 #endif
   EL_SPRING,
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_EMC_SPRING_BUMPER,
 #endif
 
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_EMC_DRIPPER,

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 7c4fc88085bc28bace615f82fec30a274e7901a5..3b9438e6031316e9fec7ebb2fd295c038b5f05e9 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2042,6 +2042,18 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
 #endif
 
 #if 1
+  /* adjust some settings if user's private level directory was detected */
+  if (leveldir_new->sort_priority == LEVELCLASS_UNDEFINED &&
+      leveldir_new->in_user_dir &&
+      (strcmp(leveldir_new->subdir, getLoginName()) == 0 ||
+       strcmp(leveldir_new->name,   getLoginName()) == 0 ||
+       strcmp(leveldir_new->author, getRealName())  == 0))
+  {
+    leveldir_new->sort_priority = LEVELCLASS_PRIVATE_START;
+    leveldir_new->readonly = FALSE;
+  }
+
+#else
   /* adjust sort priority if user's private level directory was detected */
   if (leveldir_new->sort_priority == LEVELCLASS_UNDEFINED &&
       leveldir_new->in_user_dir &&

diff --git a/src/main.h b/src/main.h
index 2a2714a830ab47b1ec5b2f1ddd289e024e0e14a2..2de55a4e53d280cdbe06df2ffa67c4c25877d8dc 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1388,24 +1388,16 @@
 
 /* program information and versioning definitions */
 
-#define RELEASE_311                    TRUE
+#define RELEASE_312                    TRUE
 
-#if RELEASE_311
 #define PROGRAM_VERSION_MAJOR          3
 #define PROGRAM_VERSION_MINOR          1
-#define PROGRAM_VERSION_PATCH          1
+#define PROGRAM_VERSION_PATCH          2
 #define PROGRAM_VERSION_BUILD          0
-#else
-/* !!! make sure that packaging script can find unique version number !!! */
-#define X_PROGRAM_VERSION_MAJOR                3
-#define X_PROGRAM_VERSION_MINOR                2
-#define X_PROGRAM_VERSION_PATCH                0
-#define X_PROGRAM_VERSION_BUILD                3
-#endif
 
 #define PROGRAM_TITLE_STRING           "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING          "Holger Schemel"
-#define PROGRAM_COPYRIGHT_STRING       "Copyright ©1995-2005 by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING       "Copyright ©1995-2006 by Holger Schemel"
 
 #define ICON_TITLE_STRING              PROGRAM_TITLE_STRING
 #define COOKIE_PREFIX                  "ROCKSNDIAMONDS"