From: Holger Schemel <info@artsoft.org>
Date: Sat, 3 Dec 2005 08:11:41 +0000 (+0100)
Subject: rnd-20051203-1-src
X-Git-Tag: 3.1.2^2~39
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=2432614fe471d61318ad634b1b8ce7f152fa43ea;p=rocksndiamonds.git

rnd-20051203-1-src
* fixed major bug which prevented private levels from being edited
* fixed graphical bug with player animation when player moves slowly
---

diff --git a/ChangeLog b/ChangeLog
index f8eec8df..0867745c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-03
+	* fixed major bug which prevented private levels from being edited
+
+2005-12-02
+	* fixed graphical bug with player animation when player moves slowly
+
 2005-11-28
 	* fixed bug which prevented "global.num_toons: 0" from working
 
diff --git a/src/conftime.h b/src/conftime.h
index 75edfffa..119bc69c 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-12-02 20:36]"
+#define COMPILE_DATE_STRING "[2005-12-03 00:09]"
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index d78e3c70..656bc519 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1965,11 +1965,16 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
   leveldir_new->in_user_dir =
     (strcmp(leveldir_new->basepath, options.level_directory) != 0);
 
-  /* adjust sort priority if user's private level directory was detected */
+  /* 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->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;
+  }
 
   leveldir_new->user_defined =
     (leveldir_new->in_user_dir && IS_LEVELCLASS_PRIVATE(leveldir_new));