rnd-20070113-2-src
[rocksndiamonds.git] / src / files.c
index b8ba6aa3af0fd8929dd4e5421257508039c7f8dd..87741c788b1fc42c6d76e02cfb5f2f2076428f63 100644 (file)
@@ -4830,435 +4830,435 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x1615:       /* (blue steel) */
-      element = EL_STEELCHAR_A;
+      element = EL_STEEL_CHAR_A;
       break;
 
     case 0x1616:       /* (blue steel) */
-      element = EL_STEELCHAR_B;
+      element = EL_STEEL_CHAR_B;
       break;
 
     case 0x1617:       /* (blue steel) */
-      element = EL_STEELCHAR_C;
+      element = EL_STEEL_CHAR_C;
       break;
 
     case 0x1618:       /* (blue steel) */
-      element = EL_STEELCHAR_D;
+      element = EL_STEEL_CHAR_D;
       break;
 
     case 0x1619:       /* (blue steel) */
-      element = EL_STEELCHAR_E;
+      element = EL_STEEL_CHAR_E;
       break;
 
     case 0x161a:       /* (blue steel) */
-      element = EL_STEELCHAR_F;
+      element = EL_STEEL_CHAR_F;
       break;
 
     case 0x161b:       /* (blue steel) */
-      element = EL_STEELCHAR_G;
+      element = EL_STEEL_CHAR_G;
       break;
 
     case 0x161c:       /* (blue steel) */
-      element = EL_STEELCHAR_H;
+      element = EL_STEEL_CHAR_H;
       break;
 
     case 0x161d:       /* (blue steel) */
-      element = EL_STEELCHAR_I;
+      element = EL_STEEL_CHAR_I;
       break;
 
     case 0x161e:       /* (blue steel) */
-      element = EL_STEELCHAR_J;
+      element = EL_STEEL_CHAR_J;
       break;
 
     case 0x161f:       /* (blue steel) */
-      element = EL_STEELCHAR_K;
+      element = EL_STEEL_CHAR_K;
       break;
 
     case 0x1620:       /* (blue steel) */
-      element = EL_STEELCHAR_L;
+      element = EL_STEEL_CHAR_L;
       break;
 
     case 0x1621:       /* (blue steel) */
-      element = EL_STEELCHAR_M;
+      element = EL_STEEL_CHAR_M;
       break;
 
     case 0x1622:       /* (blue steel) */
-      element = EL_STEELCHAR_N;
+      element = EL_STEEL_CHAR_N;
       break;
 
     case 0x1623:       /* (blue steel) */
-      element = EL_STEELCHAR_O;
+      element = EL_STEEL_CHAR_O;
       break;
 
     case 0x1624:       /* (blue steel) */
-      element = EL_STEELCHAR_P;
+      element = EL_STEEL_CHAR_P;
       break;
 
     case 0x1625:       /* (blue steel) */
-      element = EL_STEELCHAR_Q;
+      element = EL_STEEL_CHAR_Q;
       break;
 
     case 0x1626:       /* (blue steel) */
-      element = EL_STEELCHAR_R;
+      element = EL_STEEL_CHAR_R;
       break;
 
     case 0x1627:       /* (blue steel) */
-      element = EL_STEELCHAR_S;
+      element = EL_STEEL_CHAR_S;
       break;
 
     case 0x1628:       /* (blue steel) */
-      element = EL_STEELCHAR_T;
+      element = EL_STEEL_CHAR_T;
       break;
 
     case 0x1629:       /* (blue steel) */
-      element = EL_STEELCHAR_U;
+      element = EL_STEEL_CHAR_U;
       break;
 
     case 0x162a:       /* (blue steel) */
-      element = EL_STEELCHAR_V;
+      element = EL_STEEL_CHAR_V;
       break;
 
     case 0x162b:       /* (blue steel) */
-      element = EL_STEELCHAR_W;
+      element = EL_STEEL_CHAR_W;
       break;
 
     case 0x162c:       /* (blue steel) */
-      element = EL_STEELCHAR_X;
+      element = EL_STEEL_CHAR_X;
       break;
 
     case 0x162d:       /* (blue steel) */
-      element = EL_STEELCHAR_Y;
+      element = EL_STEEL_CHAR_Y;
       break;
 
     case 0x162e:       /* (blue steel) */
-      element = EL_STEELCHAR_Z;
+      element = EL_STEEL_CHAR_Z;
       break;
 
     case 0x162f:       /* (blue steel) */
-      element = EL_STEELCHAR_AUMLAUT;
+      element = EL_STEEL_CHAR_AUMLAUT;
       break;
 
     case 0x1630:       /* (blue steel) */
-      element = EL_STEELCHAR_OUMLAUT;
+      element = EL_STEEL_CHAR_OUMLAUT;
       break;
 
     case 0x1631:       /* (blue steel) */
-      element = EL_STEELCHAR_UUMLAUT;
+      element = EL_STEEL_CHAR_UUMLAUT;
       break;
 
     case 0x1632:       /* (blue steel) */
-      element = EL_STEELCHAR_0;
+      element = EL_STEEL_CHAR_0;
       break;
 
     case 0x1633:       /* (blue steel) */
-      element = EL_STEELCHAR_1;
+      element = EL_STEEL_CHAR_1;
       break;
 
     case 0x1634:       /* (blue steel) */
-      element = EL_STEELCHAR_2;
+      element = EL_STEEL_CHAR_2;
       break;
 
     case 0x1635:       /* (blue steel) */
-      element = EL_STEELCHAR_3;
+      element = EL_STEEL_CHAR_3;
       break;
 
     case 0x1636:       /* (blue steel) */
-      element = EL_STEELCHAR_4;
+      element = EL_STEEL_CHAR_4;
       break;
 
     case 0x1637:       /* (blue steel) */
-      element = EL_STEELCHAR_5;
+      element = EL_STEEL_CHAR_5;
       break;
 
     case 0x1638:       /* (blue steel) */
-      element = EL_STEELCHAR_6;
+      element = EL_STEEL_CHAR_6;
       break;
 
     case 0x1639:       /* (blue steel) */
-      element = EL_STEELCHAR_7;
+      element = EL_STEEL_CHAR_7;
       break;
 
     case 0x163a:       /* (blue steel) */
-      element = EL_STEELCHAR_8;
+      element = EL_STEEL_CHAR_8;
       break;
 
     case 0x163b:       /* (blue steel) */
-      element = EL_STEELCHAR_9;
+      element = EL_STEEL_CHAR_9;
       break;
 
     case 0x163c:       /* (blue steel) */
-      element = EL_STEELCHAR_PERIOD;
+      element = EL_STEEL_CHAR_PERIOD;
       break;
 
     case 0x163d:       /* (blue steel) */
-      element = EL_STEELCHAR_EXCLAM;
+      element = EL_STEEL_CHAR_EXCLAM;
       break;
 
     case 0x163e:       /* (blue steel) */
-      element = EL_STEELCHAR_COLON;
+      element = EL_STEEL_CHAR_COLON;
       break;
 
     case 0x163f:       /* (blue steel) */
-      element = EL_STEELCHAR_LESS;
+      element = EL_STEEL_CHAR_LESS;
       break;
 
     case 0x1640:       /* (blue steel) */
-      element = EL_STEELCHAR_GREATER;
+      element = EL_STEEL_CHAR_GREATER;
       break;
 
     case 0x1641:       /* (blue steel) */
-      element = EL_STEELCHAR_QUESTION;
+      element = EL_STEEL_CHAR_QUESTION;
       break;
 
     case 0x1642:       /* (blue steel) */
-      element = EL_STEELCHAR_COPYRIGHT;
+      element = EL_STEEL_CHAR_COPYRIGHT;
       break;
 
     case 0x1643:       /* (blue steel) */
-      element = EL_STEELCHAR_UP;
+      element = EL_STEEL_CHAR_UP;
       break;
 
     case 0x1644:       /* (blue steel) */
-      element = EL_STEELCHAR_DOWN;
+      element = EL_STEEL_CHAR_DOWN;
       break;
 
     case 0x1645:       /* (blue steel) */
-      element = EL_STEELCHAR_BUTTON;
+      element = EL_STEEL_CHAR_BUTTON;
       break;
 
     case 0x1646:       /* (blue steel) */
-      element = EL_STEELCHAR_PLUS;
+      element = EL_STEEL_CHAR_PLUS;
       break;
 
     case 0x1647:       /* (blue steel) */
-      element = EL_STEELCHAR_MINUS;
+      element = EL_STEEL_CHAR_MINUS;
       break;
 
     case 0x1648:       /* (blue steel) */
-      element = EL_STEELCHAR_APOSTROPHE;
+      element = EL_STEEL_CHAR_APOSTROPHE;
       break;
 
     case 0x1649:       /* (blue steel) */
-      element = EL_STEELCHAR_PARENLEFT;
+      element = EL_STEEL_CHAR_PARENLEFT;
       break;
 
     case 0x164a:       /* (blue steel) */
-      element = EL_STEELCHAR_PARENRIGHT;
+      element = EL_STEEL_CHAR_PARENRIGHT;
       break;
 
     case 0x164b:       /* (green steel) */
-      element = EL_STEELCHAR_A;
+      element = EL_STEEL_CHAR_A;
       break;
 
     case 0x164c:       /* (green steel) */
-      element = EL_STEELCHAR_B;
+      element = EL_STEEL_CHAR_B;
       break;
 
     case 0x164d:       /* (green steel) */
-      element = EL_STEELCHAR_C;
+      element = EL_STEEL_CHAR_C;
       break;
 
     case 0x164e:       /* (green steel) */
-      element = EL_STEELCHAR_D;
+      element = EL_STEEL_CHAR_D;
       break;
 
     case 0x164f:       /* (green steel) */
-      element = EL_STEELCHAR_E;
+      element = EL_STEEL_CHAR_E;
       break;
 
     case 0x1650:       /* (green steel) */
-      element = EL_STEELCHAR_F;
+      element = EL_STEEL_CHAR_F;
       break;
 
     case 0x1651:       /* (green steel) */
-      element = EL_STEELCHAR_G;
+      element = EL_STEEL_CHAR_G;
       break;
 
     case 0x1652:       /* (green steel) */
-      element = EL_STEELCHAR_H;
+      element = EL_STEEL_CHAR_H;
       break;
 
     case 0x1653:       /* (green steel) */
-      element = EL_STEELCHAR_I;
+      element = EL_STEEL_CHAR_I;
       break;
 
     case 0x1654:       /* (green steel) */
-      element = EL_STEELCHAR_J;
+      element = EL_STEEL_CHAR_J;
       break;
 
     case 0x1655:       /* (green steel) */
-      element = EL_STEELCHAR_K;
+      element = EL_STEEL_CHAR_K;
       break;
 
     case 0x1656:       /* (green steel) */
-      element = EL_STEELCHAR_L;
+      element = EL_STEEL_CHAR_L;
       break;
 
     case 0x1657:       /* (green steel) */
-      element = EL_STEELCHAR_M;
+      element = EL_STEEL_CHAR_M;
       break;
 
     case 0x1658:       /* (green steel) */
-      element = EL_STEELCHAR_N;
+      element = EL_STEEL_CHAR_N;
       break;
 
     case 0x1659:       /* (green steel) */
-      element = EL_STEELCHAR_O;
+      element = EL_STEEL_CHAR_O;
       break;
 
     case 0x165a:       /* (green steel) */
-      element = EL_STEELCHAR_P;
+      element = EL_STEEL_CHAR_P;
       break;
 
     case 0x165b:       /* (green steel) */
-      element = EL_STEELCHAR_Q;
+      element = EL_STEEL_CHAR_Q;
       break;
 
     case 0x165c:       /* (green steel) */
-      element = EL_STEELCHAR_R;
+      element = EL_STEEL_CHAR_R;
       break;
 
     case 0x165d:       /* (green steel) */
-      element = EL_STEELCHAR_S;
+      element = EL_STEEL_CHAR_S;
       break;
 
     case 0x165e:       /* (green steel) */
-      element = EL_STEELCHAR_T;
+      element = EL_STEEL_CHAR_T;
       break;
 
     case 0x165f:       /* (green steel) */
-      element = EL_STEELCHAR_U;
+      element = EL_STEEL_CHAR_U;
       break;
 
     case 0x1660:       /* (green steel) */
-      element = EL_STEELCHAR_V;
+      element = EL_STEEL_CHAR_V;
       break;
 
     case 0x1661:       /* (green steel) */
-      element = EL_STEELCHAR_W;
+      element = EL_STEEL_CHAR_W;
       break;
 
     case 0x1662:       /* (green steel) */
-      element = EL_STEELCHAR_X;
+      element = EL_STEEL_CHAR_X;
       break;
 
     case 0x1663:       /* (green steel) */
-      element = EL_STEELCHAR_Y;
+      element = EL_STEEL_CHAR_Y;
       break;
 
     case 0x1664:       /* (green steel) */
-      element = EL_STEELCHAR_Z;
+      element = EL_STEEL_CHAR_Z;
       break;
 
     case 0x1665:       /* (green steel) */
-      element = EL_STEELCHAR_AUMLAUT;
+      element = EL_STEEL_CHAR_AUMLAUT;
       break;
 
     case 0x1666:       /* (green steel) */
-      element = EL_STEELCHAR_OUMLAUT;
+      element = EL_STEEL_CHAR_OUMLAUT;
       break;
 
     case 0x1667:       /* (green steel) */
-      element = EL_STEELCHAR_UUMLAUT;
+      element = EL_STEEL_CHAR_UUMLAUT;
       break;
 
     case 0x1668:       /* (green steel) */
-      element = EL_STEELCHAR_0;
+      element = EL_STEEL_CHAR_0;
       break;
 
     case 0x1669:       /* (green steel) */
-      element = EL_STEELCHAR_1;
+      element = EL_STEEL_CHAR_1;
       break;
 
     case 0x166a:       /* (green steel) */
-      element = EL_STEELCHAR_2;
+      element = EL_STEEL_CHAR_2;
       break;
 
     case 0x166b:       /* (green steel) */
-      element = EL_STEELCHAR_3;
+      element = EL_STEEL_CHAR_3;
       break;
 
     case 0x166c:       /* (green steel) */
-      element = EL_STEELCHAR_4;
+      element = EL_STEEL_CHAR_4;
       break;
 
     case 0x166d:       /* (green steel) */
-      element = EL_STEELCHAR_5;
+      element = EL_STEEL_CHAR_5;
       break;
 
     case 0x166e:       /* (green steel) */
-      element = EL_STEELCHAR_6;
+      element = EL_STEEL_CHAR_6;
       break;
 
     case 0x166f:       /* (green steel) */
-      element = EL_STEELCHAR_7;
+      element = EL_STEEL_CHAR_7;
       break;
 
     case 0x1670:       /* (green steel) */
-      element = EL_STEELCHAR_8;
+      element = EL_STEEL_CHAR_8;
       break;
 
     case 0x1671:       /* (green steel) */
-      element = EL_STEELCHAR_9;
+      element = EL_STEEL_CHAR_9;
       break;
 
     case 0x1672:       /* (green steel) */
-      element = EL_STEELCHAR_PERIOD;
+      element = EL_STEEL_CHAR_PERIOD;
       break;
 
     case 0x1673:       /* (green steel) */
-      element = EL_STEELCHAR_EXCLAM;
+      element = EL_STEEL_CHAR_EXCLAM;
       break;
 
     case 0x1674:       /* (green steel) */
-      element = EL_STEELCHAR_COLON;
+      element = EL_STEEL_CHAR_COLON;
       break;
 
     case 0x1675:       /* (green steel) */
-      element = EL_STEELCHAR_LESS;
+      element = EL_STEEL_CHAR_LESS;
       break;
 
     case 0x1676:       /* (green steel) */
-      element = EL_STEELCHAR_GREATER;
+      element = EL_STEEL_CHAR_GREATER;
       break;
 
     case 0x1677:       /* (green steel) */
-      element = EL_STEELCHAR_QUESTION;
+      element = EL_STEEL_CHAR_QUESTION;
       break;
 
     case 0x1678:       /* (green steel) */
-      element = EL_STEELCHAR_COPYRIGHT;
+      element = EL_STEEL_CHAR_COPYRIGHT;
       break;
 
     case 0x1679:       /* (green steel) */
-      element = EL_STEELCHAR_UP;
+      element = EL_STEEL_CHAR_UP;
       break;
 
     case 0x167a:       /* (green steel) */
-      element = EL_STEELCHAR_DOWN;
+      element = EL_STEEL_CHAR_DOWN;
       break;
 
     case 0x167b:       /* (green steel) */
-      element = EL_STEELCHAR_BUTTON;
+      element = EL_STEEL_CHAR_BUTTON;
       break;
 
     case 0x167c:       /* (green steel) */
-      element = EL_STEELCHAR_PLUS;
+      element = EL_STEEL_CHAR_PLUS;
       break;
 
     case 0x167d:       /* (green steel) */
-      element = EL_STEELCHAR_MINUS;
+      element = EL_STEEL_CHAR_MINUS;
       break;
 
     case 0x167e:       /* (green steel) */
-      element = EL_STEELCHAR_APOSTROPHE;
+      element = EL_STEEL_CHAR_APOSTROPHE;
       break;
 
     case 0x167f:       /* (green steel) */
-      element = EL_STEELCHAR_PARENLEFT;
+      element = EL_STEEL_CHAR_PARENLEFT;
       break;
 
     case 0x1680:       /* (green steel) */
-      element = EL_STEELCHAR_PARENRIGHT;
+      element = EL_STEEL_CHAR_PARENRIGHT;
       break;
 
     case 0x1681:       /* gate (red) */
@@ -5346,87 +5346,87 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x1696:       /* steel wall (left) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_LEFT;
       break;
 
     case 0x1697:       /* steel wall (bottom) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_BOTTOM;
       break;
 
     case 0x1698:       /* steel wall (right) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_RIGHT;
       break;
 
     case 0x1699:       /* steel wall (top) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_TOP;
       break;
 
     case 0x169a:       /* steel wall (left/bottom) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_BOTTOMLEFT;
       break;
 
     case 0x169b:       /* steel wall (right/bottom) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_BOTTOMRIGHT;
       break;
 
     case 0x169c:       /* steel wall (right/top) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_TOPRIGHT;
       break;
 
     case 0x169d:       /* steel wall (left/top) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_TOPLEFT;
       break;
 
     case 0x169e:       /* steel wall (right/bottom small) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_BOTTOMRIGHT_2;
       break;
 
     case 0x169f:       /* steel wall (left/bottom small) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_BOTTOMLEFT_2;
       break;
 
     case 0x16a0:       /* steel wall (right/top small) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_TOPRIGHT_2;
       break;
 
     case 0x16a1:       /* steel wall (left/top small) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_TOPLEFT_2;
       break;
 
     case 0x16a2:       /* steel wall (left/right) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_VERTICAL;
       break;
 
     case 0x16a3:       /* steel wall (top/bottom) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_1_HORIZONTAL;
       break;
 
     case 0x16a4:       /* steel wall 2 (left end) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_2_LEFT;
       break;
 
     case 0x16a5:       /* steel wall 2 (right end) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_2_RIGHT;
       break;
 
     case 0x16a6:       /* steel wall 2 (top end) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_2_TOP;
       break;
 
     case 0x16a7:       /* steel wall 2 (bottom end) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_2_BOTTOM;
       break;
 
     case 0x16a8:       /* steel wall 2 (left/right) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_2_HORIZONTAL;
       break;
 
     case 0x16a9:       /* steel wall 2 (up/down) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_2_VERTICAL;
       break;
 
     case 0x16aa:       /* steel wall 2 (mid) */
-      element = EL_STEELWALL;
+      element = EL_DC_STEELWALL_2_MIDDLE;
       break;
 
     case 0x16ab:
@@ -5695,6 +5695,25 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
   level->shield_normal_time    = header[58] | (header[59] << 8);
 
   fclose(file);
+
+  /* Diamond Caves II levels are always surrounded by indestructible wall, but
+     not necessarily in a rectangular way -- fill with invisible steel wall */
+
+  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
+  {
+#if 1
+    if ((x == 0 || x == level->fieldx - 1 ||
+        y == 0 || y == level->fieldy - 1) &&
+       level->field[x][y] == EL_EMPTY)
+      level->field[x][y] = EL_INVISIBLE_STEELWALL;
+#else
+    if ((x == 0 || x == level->fieldx - 1 ||
+        y == 0 || y == level->fieldy - 1) &&
+       level->field[x][y] == EL_EMPTY)
+      FloodFillLevel(x, y, EL_INVISIBLE_STEELWALL,
+                    level->field, level->fieldx, level->fieldy);
+#endif
+  }
 }
 
 
@@ -7664,7 +7683,7 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES    6
 #define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH   7
 #define SETUP_TOKEN_EDITOR_EL_CHARS            8
-#define SETUP_TOKEN_EDITOR_EL_STEELCHARS       9
+#define SETUP_TOKEN_EDITOR_EL_STEEL_CHARS      9
 #define SETUP_TOKEN_EDITOR_EL_CUSTOM           10
 #define SETUP_TOKEN_EDITOR_EL_HEADLINES                11
 #define SETUP_TOKEN_EDITOR_EL_USER_DEFINED     12
@@ -7802,7 +7821,7 @@ static struct TokenInfo editor_setup_tokens[] =
   { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash"     },
 #endif
   { TYPE_SWITCH, &sei.el_chars,                "editor.el_chars"               },
-  { TYPE_SWITCH, &sei.el_steelchars,   "editor.el_steelchars"          },
+  { TYPE_SWITCH, &sei.el_steel_chars,  "editor.el_steel_chars"         },
   { TYPE_SWITCH, &sei.el_custom,       "editor.el_custom"              },
 #if 1
   { TYPE_SWITCH, &not_used,            "editor.el_headlines"           },
@@ -7827,7 +7846,7 @@ static struct TokenInfo editor_cascade_setup_tokens[] =
   { TYPE_SWITCH, &seci.el_dc,          "editor.cascade.el_dc"          },
   { TYPE_SWITCH, &seci.el_dx,          "editor.cascade.el_dx"          },
   { TYPE_SWITCH, &seci.el_chars,       "editor.cascade.el_chars"       },
-  { TYPE_SWITCH, &seci.el_steelchars,  "editor.cascade.el_steelchars"  },
+  { TYPE_SWITCH, &seci.el_steel_chars, "editor.cascade.el_steel_chars" },
   { TYPE_SWITCH, &seci.el_ce,          "editor.cascade.el_ce"          },
   { TYPE_SWITCH, &seci.el_ge,          "editor.cascade.el_ge"          },
   { TYPE_SWITCH, &seci.el_ref,         "editor.cascade.el_ref"         },
@@ -7931,17 +7950,17 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->override_level_sounds = FALSE;
   si->override_level_music = FALSE;
 
-  si->editor.el_boulderdash       = TRUE;
-  si->editor.el_emerald_mine      = TRUE;
-  si->editor.el_emerald_mine_club = TRUE;
-  si->editor.el_more              = TRUE;
-  si->editor.el_sokoban           = TRUE;
-  si->editor.el_supaplex          = TRUE;
-  si->editor.el_diamond_caves     = TRUE;
-  si->editor.el_dx_boulderdash    = TRUE;
-  si->editor.el_chars             = TRUE;
-  si->editor.el_steelchars        = TRUE;
-  si->editor.el_custom            = TRUE;
+  si->editor.el_boulderdash            = TRUE;
+  si->editor.el_emerald_mine           = TRUE;
+  si->editor.el_emerald_mine_club      = TRUE;
+  si->editor.el_more                   = TRUE;
+  si->editor.el_sokoban                        = TRUE;
+  si->editor.el_supaplex               = TRUE;
+  si->editor.el_diamond_caves          = TRUE;
+  si->editor.el_dx_boulderdash         = TRUE;
+  si->editor.el_chars                  = TRUE;
+  si->editor.el_steel_chars            = TRUE;
+  si->editor.el_custom                 = TRUE;
 
   si->editor.el_headlines = TRUE;
   si->editor.el_user_defined = FALSE;
@@ -7949,15 +7968,15 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->editor.show_element_token = FALSE;
 
-  si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
-  si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
-  si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;
+  si->shortcut.save_game       = DEFAULT_KEY_SAVE_GAME;
+  si->shortcut.load_game       = DEFAULT_KEY_LOAD_GAME;
+  si->shortcut.toggle_pause    = DEFAULT_KEY_TOGGLE_PAUSE;
 
-  si->shortcut.focus_player[0] = DEFAULT_KEY_FOCUS_PLAYER_1;
-  si->shortcut.focus_player[1] = DEFAULT_KEY_FOCUS_PLAYER_2;
-  si->shortcut.focus_player[2] = DEFAULT_KEY_FOCUS_PLAYER_3;
-  si->shortcut.focus_player[3] = DEFAULT_KEY_FOCUS_PLAYER_4;
-  si->shortcut.focus_player_all = DEFAULT_KEY_FOCUS_PLAYER_ALL;
+  si->shortcut.focus_player[0] = DEFAULT_KEY_FOCUS_PLAYER_1;
+  si->shortcut.focus_player[1] = DEFAULT_KEY_FOCUS_PLAYER_2;
+  si->shortcut.focus_player[2] = DEFAULT_KEY_FOCUS_PLAYER_3;
+  si->shortcut.focus_player[3] = DEFAULT_KEY_FOCUS_PLAYER_4;
+  si->shortcut.focus_player_all        = DEFAULT_KEY_FOCUS_PLAYER_ALL;
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
@@ -7997,7 +8016,7 @@ static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)
   si->editor_cascade.el_dx             = TRUE;
 
   si->editor_cascade.el_chars          = FALSE;
-  si->editor_cascade.el_steelchars     = FALSE;
+  si->editor_cascade.el_steel_chars    = FALSE;
   si->editor_cascade.el_ce             = FALSE;
   si->editor_cascade.el_ge             = FALSE;
   si->editor_cascade.el_ref            = FALSE;