rnd-20070203-2-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 5bfdcf629deb63e7832c3c592c12becb35f13390..e9d254f30186476aec9d4619bf970acfae03c013 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -739,6 +739,17 @@ static struct LevelFileConfigInfo chunk_config_NOTE[] =
     &xx_envelope.ysize,                        MAX_ENVELOPE_YSIZE,
   },
 
+  {
+    -1,                                        -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(3),
+    &xx_envelope.autowrap,             FALSE
+  },
+  {
+    -1,                                        -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(4),
+    &xx_envelope.centered,             FALSE
+  },
+
   {
     -1,                                        -1,
     TYPE_STRING,                       CONF_VALUE_BYTES(1),
@@ -4133,7 +4144,7 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x0e77:       /* quicksand (boulder) */
-      element = EL_QUICKSAND_FULL;
+      element = EL_QUICKSAND_FAST_FULL;
       break;
 
     case 0x0e99:       /* slow quicksand (boulder) */
@@ -4157,19 +4168,19 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x0f4f:       /* dynamite (lit 1) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f57:       /* dynamite (lit 2) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f5f:       /* dynamite (lit 3) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f67:       /* dynamite (lit 4) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f81:
@@ -4184,7 +4195,7 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x0fb9:
-      element = EL_MAGIC_WALL;
+      element = EL_DC_MAGIC_WALL;
       break;
 
     case 0x0fd0:
@@ -4332,7 +4343,7 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x14e9:
-      element = EL_SHIELD_NORMAL;
+      element = EL_SHIELD_DEADLY;
       break;
 
     case 0x1501:
@@ -4348,7 +4359,7 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x1578:       /* quicksand (empty) */
-      element = EL_QUICKSAND_EMPTY;
+      element = EL_QUICKSAND_FAST_EMPTY;
       break;
 
     case 0x1579:       /* slow quicksand (empty) */
@@ -4362,7 +4373,7 @@ int getMappedElement_DC(int element)
       /* EL_DC_LANDMINE */
 
     case 0x15a0:
-      element = EL_DYNAMITE;
+      element = EL_EM_DYNAMITE;
       break;
 
     case 0x15a1:       /* key (red) */
@@ -4382,7 +4393,7 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x15a5:       /* key (white) */
-      element = EL_KEY_WHITE;
+      element = EL_DC_KEY_WHITE;
       break;
 
     case 0x15a6:
@@ -5294,15 +5305,15 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x1689:       /* gate (white) */
-      element = EL_DOOR_WHITE;
+      element = EL_DC_GATE_WHITE;
       break;
 
     case 0x168a:       /* secret gate (white) */
-      element = EL_DOOR_WHITE_GRAY;
+      element = EL_DC_GATE_WHITE_GRAY;
       break;
 
     case 0x168b:       /* secret gate (no key) */
-      element = EL_UNKNOWN;
+      element = EL_DC_GATE_FAKE_GRAY;
       break;
 
     case 0x168c:
@@ -5615,6 +5626,11 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
 
   level->envelope[0].text[envelope_size] = '\0';
 
+  level->envelope[0].xsize = MAX_ENVELOPE_XSIZE;
+  level->envelope[0].ysize = 10;
+  level->envelope[0].autowrap = TRUE;
+  level->envelope[0].centered = TRUE;
+
   for (i = 0; i < level_name_len; i++)
     level->name[i] = header[level_name_pos + 1 + i];
   level->name[level_name_len] = '\0';