From: Holger Schemel <info@artsoft.org>
Date: Sun, 14 Nov 2004 10:46:09 +0000 (+0100)
Subject: rnd-20041114-1-src
X-Git-Tag: 3.1.1^2~50
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=002c075b9935dc5dc055d3a8f35b2774796fa1c4

rnd-20041114-1-src
* added use of "editorsetup.conf" for different level sets
---

diff --git a/ChangeLog b/ChangeLog
index dde58647..1364db0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-11-13
+	* added use of "editorsetup.conf" for different level sets
+
 2004-10-26
 	* added auto-detection for various types of Emerald Mine level files
 
diff --git a/src/conftime.h b/src/conftime.h
index 3639cfa3..837157f0 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-10-26 02:14]"
+#define COMPILE_DATE_STRING "[2004-11-13 21:37]"
diff --git a/src/editor.c b/src/editor.c
index 75c92d39..1a1a8527 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -4096,7 +4096,11 @@ static void ReinitializeElementList()
 
   checked_free(editor_elements);
 
+#if 0
   if (!initialized)
+#else
+  /* reload user defined element list for each invocation of level editor */
+#endif
   {
     /* initialize optional user defined element list */
     LoadUserDefinedEditorElementList(&editor_el_user_defined_ptr,
diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index 1d7e1130..ebf93725 100644
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -84,6 +84,7 @@ static void animscreen(void)
   for (y = top; y < top + MAX_BUF_YSIZE; y++)
   {
     dy = y % MAX_BUF_YSIZE;
+
     for (x = left; x < left + MAX_BUF_XSIZE; x++)
     {
       dx = x % MAX_BUF_XSIZE;
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index dc01ad4c..d63bc561 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -404,7 +404,12 @@ char *getEditorSetupFilename()
   static char *filename = NULL;
 
   checked_free(filename);
+  filename = getPath2(getCurrentLevelDir(), EDITORSETUP_FILENAME);
 
+  if (fileExists(filename))
+    return filename;
+
+  checked_free(filename);
   filename = getPath2(getSetupDir(), EDITORSETUP_FILENAME);
 
   return filename;
@@ -438,8 +443,8 @@ char *getLevelSetInfoFilename()
   char *basenames[] =
   {
     "README",
-    "README.txt",
     "README.TXT",
+    "README.txt",
     "Readme",
     "Readme.txt",
     "readme",
@@ -452,8 +457,8 @@ char *getLevelSetInfoFilename()
   for (i = 0; basenames[i] != NULL; i++)
   {
     checked_free(filename);
-
     filename = getPath2(getCurrentLevelDir(), basenames[i]);
+
     if (fileExists(filename))
       return filename;
   }
diff --git a/src/screens.c b/src/screens.c
index b1b57242..ed616df1 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1957,6 +1957,7 @@ static struct TokenInfo setup_info_editor[] =
 #endif
   { TYPE_SWITCH,	&setup.editor.el_boulderdash,	"BoulderDash:"	},
   { TYPE_SWITCH,	&setup.editor.el_emerald_mine,	"Emerald Mine:"	},
+  { TYPE_SWITCH,	&setup.editor.el_emerald_mine_club,"E.M. Club:"	},
   { TYPE_SWITCH,	&setup.editor.el_more,		"More:"		},
   { TYPE_SWITCH,	&setup.editor.el_sokoban,	"Sokoban:"	},
   { TYPE_SWITCH,	&setup.editor.el_supaplex,	"Supaplex:"	},