From: Holger Schemel <info@artsoft.org>
Date: Sun, 20 Feb 2005 03:23:59 +0000 (+0100)
Subject: rnd-20050220-1-src
X-Git-Tag: 3.1.1^2~23
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=66967822ba41a7912b70292ee6bed3c0f6b3e968;p=rocksndiamonds.git

rnd-20050220-1-src
---

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 244b2940..a5e835ab 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -3311,7 +3311,6 @@ struct ConfigInfo image_config[] =
   { "emc_gate_5_gray.EDITOR",			"RocksEMC.pcx"		},
   { "emc_gate_5_gray.EDITOR.xpos",		"0"			},
   { "emc_gate_5_gray.EDITOR.ypos",		"7"			},
-  { "emc_gate_5_gray.EDITOR.frames",		"1"			},
   { "emc_gate_6",				"RocksEMC.pcx"		},
   { "emc_gate_6.xpos",				"1"			},
   { "emc_gate_6.ypos",				"6"			},
@@ -3323,7 +3322,6 @@ struct ConfigInfo image_config[] =
   { "emc_gate_6_gray.EDITOR",			"RocksEMC.pcx"		},
   { "emc_gate_6_gray.EDITOR.xpos",		"1"			},
   { "emc_gate_6_gray.EDITOR.ypos",		"7"			},
-  { "emc_gate_6_gray.EDITOR.frames",		"1"			},
   { "emc_gate_7",				"RocksEMC.pcx"		},
   { "emc_gate_7.xpos",				"2"			},
   { "emc_gate_7.ypos",				"6"			},
@@ -3335,7 +3333,6 @@ struct ConfigInfo image_config[] =
   { "emc_gate_7_gray.EDITOR",			"RocksEMC.pcx"		},
   { "emc_gate_7_gray.EDITOR.xpos",		"2"			},
   { "emc_gate_7_gray.EDITOR.ypos",		"7"			},
-  { "emc_gate_7_gray.EDITOR.frames",		"1"			},
   { "emc_gate_8",				"RocksEMC.pcx"		},
   { "emc_gate_8.xpos",				"3"			},
   { "emc_gate_8.ypos",				"6"			},
@@ -3347,7 +3344,6 @@ struct ConfigInfo image_config[] =
   { "emc_gate_8_gray.EDITOR",			"RocksEMC.pcx"		},
   { "emc_gate_8_gray.EDITOR.xpos",		"3"			},
   { "emc_gate_8_gray.EDITOR.ypos",		"7"			},
-  { "emc_gate_8_gray.EDITOR.frames",		"1"			},
 
   { "emc_android",				"emc_object.pcx"	},
   { "emc_android.xpos",				"7"			},
@@ -3561,7 +3557,6 @@ struct ConfigInfo image_config[] =
   { "emc_dripper.EDITOR",			"emc_object.pcx"	},
   { "emc_dripper.EDITOR.xpos",			"25"			},
   { "emc_dripper.EDITOR.ypos",			"15"			},
-  { "emc_dripper.EDITOR.frames",		"1"			},
   { "emc_dripper.EDITOR.scale_up_factor",	"2"			},
   { "emc_dripper.active",			"emc_object.pcx"	},
   { "emc_dripper.active.xpos",			"25"			},
diff --git a/src/conftime.h b/src/conftime.h
index feafd967..af5496e0 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-02-19 02:22]"
+#define COMPILE_DATE_STRING "[2005-02-20 00:31]"
diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 8bcf586d..dc5d78c6 100644
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -213,13 +213,13 @@ int cleanup_em_level(unsigned char *src, int length)
   /* fix acid */
   for (i = 64; i < 2048; i++)
   {
-    if (src[i] == 63)
+    if (src[i] == 63)		/* 'Xacid_s' (acid pool, bottom middle) */
     {
       if (file_version == FILE_VERSION_EM_V4 &&
 	  i < 2048 - 64 && src[i + 64] == 63)
-	src[i - 64] = 255;
+	src[i - 64] = 255;	/* replace element above with 'Xfake_acid_1' */
       else
-	src[i - 64] = 101;
+	src[i - 64] = 101;	/* replace element above with 'Xacid_1' */
     }
   }
 #endif