projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 3ccc53524dcb5d49e88f0501750965570215e10c..b7e34adf1b3d2ab8267102e7cb48731f9d9be03d 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-2603,7
+2603,11
@@
static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
ti->last_level = 0;
ti->level_group = FALSE;
ti->handicap_level = 0;
ti->last_level = 0;
ti->level_group = FALSE;
ti->handicap_level = 0;
+#if 1
+ ti->readonly = parent->readonly;
+#else
ti->readonly = TRUE;
ti->readonly = TRUE;
+#endif
ti->handicap = TRUE;
ti->skip_levels = FALSE;
}
ti->handicap = TRUE;
ti->skip_levels = FALSE;
}
@@
-3137,6
+3141,12
@@
static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
leveldir_new->in_user_dir =
(!strEqual(leveldir_new->basepath, options.level_directory));
leveldir_new->in_user_dir =
(!strEqual(leveldir_new->basepath, options.level_directory));
+#if 0
+ printf("::: '%s' -> %d\n",
+ leveldir_new->identifier,
+ leveldir_new->in_user_dir);
+#endif
+
/* adjust some settings if user's private level directory was detected */
if (leveldir_new->sort_priority == LEVELCLASS_UNDEFINED &&
leveldir_new->in_user_dir &&
/* adjust some settings if user's private level directory was detected */
if (leveldir_new->sort_priority == LEVELCLASS_UNDEFINED &&
leveldir_new->in_user_dir &&