From: Holger Schemel <info@artsoft.org>
Date: Tue, 28 Feb 2006 20:14:39 +0000 (+0100)
Subject: rnd-20060228-1-src
X-Git-Tag: 3.2.0^2~59
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=5c717898f717007b885f86e0d02f10d2a0306237;p=rocksndiamonds.git

rnd-20060228-1-src
* fixed bug when scanning empty level group directories (endless loop)
---

diff --git a/ChangeLog b/ChangeLog
index 120b6501..1fb0d8b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-02-28
+	* fixed bug when scanning empty level group directories (endless loop)
+
 2006-02-26
 	* fixed bug with explosion graphic for player using "Murphy" graphic
 	* fixed bug with explosion graphic if player leaves explosion in time
diff --git a/src/conftime.h b/src/conftime.h
index cc830fbb..afb446e8 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-02-26 16:17]"
+#define COMPILE_DATE_STRING "[2006-02-28 20:57]"
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 396939e7..3ff575d1 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2113,7 +2113,8 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first,
 
   closedir(dir);
 
-  if (!valid_entry_found)
+  /* special case: top level directory may directly contain "levelinfo.conf" */
+  if (node_parent == NULL && !valid_entry_found)
   {
     /* check if this directory directly contains a file "levelinfo.conf" */
     valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent,
diff --git a/src/screens.c b/src/screens.c
index ed937406..76e24447 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -2064,12 +2064,6 @@ static struct TokenInfo setup_info_game[] =
 
 static struct TokenInfo setup_info_editor[] =
 {
-#if 0
-  { TYPE_STRING,	NULL,			"Offer Special Elements:"},
-#endif
-
-#if 0
-#else
   { TYPE_SWITCH,	&setup.editor.el_boulderdash,	"Boulder Dash:" },
   { TYPE_SWITCH,	&setup.editor.el_emerald_mine,	"Emerald Mine:"	},
   { TYPE_SWITCH, &setup.editor.el_emerald_mine_club,	"Emerald Mine Club:" },
@@ -2078,7 +2072,6 @@ static struct TokenInfo setup_info_editor[] =
   { TYPE_SWITCH,	&setup.editor.el_supaplex,	"Supaplex:"	},
   { TYPE_SWITCH,	&setup.editor.el_diamond_caves,	"Diamond Caves II:" },
   { TYPE_SWITCH,	&setup.editor.el_dx_boulderdash,"DX-Boulderdash:" },
-#endif
   { TYPE_SWITCH,	&setup.editor.el_chars,		"Text Characters:" },
   { TYPE_SWITCH,	&setup.editor.el_custom,  "Custom & Group Elements:" },
   { TYPE_SWITCH,	&setup.editor.el_headlines,	"Headlines:"	},