rnd-20060228-1-src

* fixed bug when scanning empty level group directories (endless loop)

diff --git a/ChangeLog b/ChangeLog
index 120b6501f3b8afc5384f0678987b42fba689c97b..1fb0d8b93ae9ede2c04e68318927b40862491a79 100644 (file)
--- 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 cc830fbb4e9ebe95862ca56292dc477936702520..afb446e89071af3d29bd6ec00f60cc1efd3df46f 100644 (file)
--- 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 396939e7a64d8728223e21220695d54d6b95424c..3ff575d19d7d2a10e9230384e386899e95bce5b7 100644 (file)
--- 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 ed937406044ecf2e7479b0f47ca1288335f53805..76e2444709815029e88dd31fcad6bbe6d4510ca1 100644 (file)
--- 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:"    },