X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=88ca1817e8096b7c5b07fcb9cfb9a33707237395;hb=0838017832a108ba365ea0efb851fc8c4d5f3aa5;hp=2107671b01e47d9fbeaf98df0ecc1e66bf9f167b;hpb=e6ed39c482b81ce13e49876aacb4f6dd2d573c41;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 2107671b..88ca1817 100644 --- a/src/files.c +++ b/src/files.c @@ -264,6 +264,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = TYPE_BOOLEAN, CONF_VALUE_8_BIT(6), &li.continuous_snapping, TRUE }, + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(12), + &li.shifted_relocation, FALSE + }, /* (these values are different for each player) */ { @@ -739,6 +744,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), @@ -4110,7 +4126,7 @@ int getMappedElement_DC(int element) element = EL_ROCK; break; - /* 0x0118 - 0x036c: (?) */ + /* 0x0117 - 0x036e: (?) */ /* EL_DIAMOND */ /* 0x042d - 0x0684: (?) */ @@ -4133,7 +4149,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) */ @@ -4141,35 +4157,35 @@ int getMappedElement_DC(int element) break; case 0x0ed2: - element = EL_EXIT_OPEN; + element = EL_EM_EXIT_OPEN; break; case 0x0ee3: - element = EL_EXIT_CLOSED; + element = EL_EM_EXIT_CLOSED; break; - case 0x0eeb: /* steel exit (open) */ - element = EL_EXIT_OPEN; + case 0x0eeb: + element = EL_EM_STEEL_EXIT_OPEN; break; - case 0x0efc: /* steel exit (closed) */ - element = EL_EXIT_CLOSED; + case 0x0efc: + element = EL_EM_STEEL_EXIT_CLOSED; 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 +4200,7 @@ int getMappedElement_DC(int element) break; case 0x0fb9: - element = EL_MAGIC_WALL; + element = EL_DC_MAGIC_WALL; break; case 0x0fd0: @@ -4252,7 +4268,7 @@ int getMappedElement_DC(int element) break; case 0x1437: - element = EL_SWITCHGATE_SWITCH_UP; + element = EL_DC_SWITCHGATE_SWITCH_UP; break; case 0x143a: @@ -4320,19 +4336,19 @@ int getMappedElement_DC(int element) break; case 0x14ce: /* growing steel wall (left/right) */ - element = EL_EXPANDABLE_WALL_HORIZONTAL; + element = EL_EXPANDABLE_STEELWALL_HORIZONTAL; break; case 0x14df: /* growing steel wall (up/down) */ - element = EL_EXPANDABLE_WALL_VERTICAL; + element = EL_EXPANDABLE_STEELWALL_VERTICAL; break; case 0x14e8: /* growing steel wall (up/down/left/right) */ - element = EL_EXPANDABLE_WALL_ANY; + element = EL_EXPANDABLE_STEELWALL_ANY; break; case 0x14e9: - element = EL_SHIELD_NORMAL; + element = EL_SHIELD_DEADLY; break; case 0x1501: @@ -4348,7 +4364,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) */ @@ -4359,10 +4375,10 @@ int getMappedElement_DC(int element) /* EL_SAND */ /* 0x1590 - 0x159f: */ - /* EL_LANDMINE */ + /* EL_DC_LANDMINE */ case 0x15a0: - element = EL_DYNAMITE; + element = EL_EM_DYNAMITE; break; case 0x15a1: /* key (red) */ @@ -4382,7 +4398,7 @@ int getMappedElement_DC(int element) break; case 0x15a5: /* key (white) */ - element = EL_KEY_WHITE; + element = EL_DC_KEY_WHITE; break; case 0x15a6: @@ -4582,15 +4598,15 @@ int getMappedElement_DC(int element) break; case 0x15d7: /* (blue) */ - element = EL_CHAR_ASCIICIRCUM; + element = EL_CHAR_UP; break; case 0x15d8: /* (blue) */ - element = EL_CHAR_UNDERSCORE; + element = EL_CHAR_DOWN; break; case 0x15d9: /* (blue) */ - element = EL_CHAR_ASTERISK; + element = EL_CHAR_BUTTON; break; case 0x15da: /* (blue) */ @@ -4798,15 +4814,15 @@ int getMappedElement_DC(int element) break; case 0x160d: /* (green) */ - element = EL_CHAR_ASCIICIRCUM; + element = EL_CHAR_UP; break; case 0x160e: /* (green) */ - element = EL_CHAR_UNDERSCORE; + element = EL_CHAR_DOWN; break; case 0x160f: /* (green) */ - element = EL_CHAR_ASTERISK; + element = EL_CHAR_BUTTON; break; case 0x1610: /* (green) */ @@ -4830,435 +4846,435 @@ int getMappedElement_DC(int element) break; case 0x1615: /* (blue steel) */ - element = EL_CHAR_A; + element = EL_STEEL_CHAR_A; break; case 0x1616: /* (blue steel) */ - element = EL_CHAR_B; + element = EL_STEEL_CHAR_B; break; case 0x1617: /* (blue steel) */ - element = EL_CHAR_C; + element = EL_STEEL_CHAR_C; break; case 0x1618: /* (blue steel) */ - element = EL_CHAR_D; + element = EL_STEEL_CHAR_D; break; case 0x1619: /* (blue steel) */ - element = EL_CHAR_E; + element = EL_STEEL_CHAR_E; break; case 0x161a: /* (blue steel) */ - element = EL_CHAR_F; + element = EL_STEEL_CHAR_F; break; case 0x161b: /* (blue steel) */ - element = EL_CHAR_G; + element = EL_STEEL_CHAR_G; break; case 0x161c: /* (blue steel) */ - element = EL_CHAR_H; + element = EL_STEEL_CHAR_H; break; case 0x161d: /* (blue steel) */ - element = EL_CHAR_I; + element = EL_STEEL_CHAR_I; break; case 0x161e: /* (blue steel) */ - element = EL_CHAR_J; + element = EL_STEEL_CHAR_J; break; case 0x161f: /* (blue steel) */ - element = EL_CHAR_K; + element = EL_STEEL_CHAR_K; break; case 0x1620: /* (blue steel) */ - element = EL_CHAR_L; + element = EL_STEEL_CHAR_L; break; case 0x1621: /* (blue steel) */ - element = EL_CHAR_M; + element = EL_STEEL_CHAR_M; break; case 0x1622: /* (blue steel) */ - element = EL_CHAR_N; + element = EL_STEEL_CHAR_N; break; case 0x1623: /* (blue steel) */ - element = EL_CHAR_O; + element = EL_STEEL_CHAR_O; break; case 0x1624: /* (blue steel) */ - element = EL_CHAR_P; + element = EL_STEEL_CHAR_P; break; case 0x1625: /* (blue steel) */ - element = EL_CHAR_Q; + element = EL_STEEL_CHAR_Q; break; case 0x1626: /* (blue steel) */ - element = EL_CHAR_R; + element = EL_STEEL_CHAR_R; break; case 0x1627: /* (blue steel) */ - element = EL_CHAR_S; + element = EL_STEEL_CHAR_S; break; case 0x1628: /* (blue steel) */ - element = EL_CHAR_T; + element = EL_STEEL_CHAR_T; break; case 0x1629: /* (blue steel) */ - element = EL_CHAR_U; + element = EL_STEEL_CHAR_U; break; case 0x162a: /* (blue steel) */ - element = EL_CHAR_V; + element = EL_STEEL_CHAR_V; break; case 0x162b: /* (blue steel) */ - element = EL_CHAR_W; + element = EL_STEEL_CHAR_W; break; case 0x162c: /* (blue steel) */ - element = EL_CHAR_X; + element = EL_STEEL_CHAR_X; break; case 0x162d: /* (blue steel) */ - element = EL_CHAR_Y; + element = EL_STEEL_CHAR_Y; break; case 0x162e: /* (blue steel) */ - element = EL_CHAR_Z; + element = EL_STEEL_CHAR_Z; break; case 0x162f: /* (blue steel) */ - element = EL_CHAR_AUMLAUT; + element = EL_STEEL_CHAR_AUMLAUT; break; case 0x1630: /* (blue steel) */ - element = EL_CHAR_OUMLAUT; + element = EL_STEEL_CHAR_OUMLAUT; break; case 0x1631: /* (blue steel) */ - element = EL_CHAR_UUMLAUT; + element = EL_STEEL_CHAR_UUMLAUT; break; case 0x1632: /* (blue steel) */ - element = EL_CHAR_0; + element = EL_STEEL_CHAR_0; break; case 0x1633: /* (blue steel) */ - element = EL_CHAR_1; + element = EL_STEEL_CHAR_1; break; case 0x1634: /* (blue steel) */ - element = EL_CHAR_2; + element = EL_STEEL_CHAR_2; break; case 0x1635: /* (blue steel) */ - element = EL_CHAR_3; + element = EL_STEEL_CHAR_3; break; case 0x1636: /* (blue steel) */ - element = EL_CHAR_4; + element = EL_STEEL_CHAR_4; break; case 0x1637: /* (blue steel) */ - element = EL_CHAR_5; + element = EL_STEEL_CHAR_5; break; case 0x1638: /* (blue steel) */ - element = EL_CHAR_6; + element = EL_STEEL_CHAR_6; break; case 0x1639: /* (blue steel) */ - element = EL_CHAR_7; + element = EL_STEEL_CHAR_7; break; case 0x163a: /* (blue steel) */ - element = EL_CHAR_8; + element = EL_STEEL_CHAR_8; break; case 0x163b: /* (blue steel) */ - element = EL_CHAR_9; + element = EL_STEEL_CHAR_9; break; case 0x163c: /* (blue steel) */ - element = EL_CHAR_PERIOD; + element = EL_STEEL_CHAR_PERIOD; break; case 0x163d: /* (blue steel) */ - element = EL_CHAR_EXCLAM; + element = EL_STEEL_CHAR_EXCLAM; break; case 0x163e: /* (blue steel) */ - element = EL_CHAR_COLON; + element = EL_STEEL_CHAR_COLON; break; case 0x163f: /* (blue steel) */ - element = EL_CHAR_LESS; + element = EL_STEEL_CHAR_LESS; break; case 0x1640: /* (blue steel) */ - element = EL_CHAR_GREATER; + element = EL_STEEL_CHAR_GREATER; break; case 0x1641: /* (blue steel) */ - element = EL_CHAR_QUESTION; + element = EL_STEEL_CHAR_QUESTION; break; case 0x1642: /* (blue steel) */ - element = EL_CHAR_COPYRIGHT; + element = EL_STEEL_CHAR_COPYRIGHT; break; case 0x1643: /* (blue steel) */ - element = EL_CHAR_ASCIICIRCUM; + element = EL_STEEL_CHAR_UP; break; case 0x1644: /* (blue steel) */ - element = EL_CHAR_UNDERSCORE; + element = EL_STEEL_CHAR_DOWN; break; case 0x1645: /* (blue steel) */ - element = EL_CHAR_ASTERISK; + element = EL_STEEL_CHAR_BUTTON; break; case 0x1646: /* (blue steel) */ - element = EL_CHAR_PLUS; + element = EL_STEEL_CHAR_PLUS; break; case 0x1647: /* (blue steel) */ - element = EL_CHAR_MINUS; + element = EL_STEEL_CHAR_MINUS; break; case 0x1648: /* (blue steel) */ - element = EL_CHAR_APOSTROPHE; + element = EL_STEEL_CHAR_APOSTROPHE; break; case 0x1649: /* (blue steel) */ - element = EL_CHAR_PARENLEFT; + element = EL_STEEL_CHAR_PARENLEFT; break; case 0x164a: /* (blue steel) */ - element = EL_CHAR_PARENRIGHT; + element = EL_STEEL_CHAR_PARENRIGHT; break; case 0x164b: /* (green steel) */ - element = EL_CHAR_A; + element = EL_STEEL_CHAR_A; break; case 0x164c: /* (green steel) */ - element = EL_CHAR_B; + element = EL_STEEL_CHAR_B; break; case 0x164d: /* (green steel) */ - element = EL_CHAR_C; + element = EL_STEEL_CHAR_C; break; case 0x164e: /* (green steel) */ - element = EL_CHAR_D; + element = EL_STEEL_CHAR_D; break; case 0x164f: /* (green steel) */ - element = EL_CHAR_E; + element = EL_STEEL_CHAR_E; break; case 0x1650: /* (green steel) */ - element = EL_CHAR_F; + element = EL_STEEL_CHAR_F; break; case 0x1651: /* (green steel) */ - element = EL_CHAR_G; + element = EL_STEEL_CHAR_G; break; case 0x1652: /* (green steel) */ - element = EL_CHAR_H; + element = EL_STEEL_CHAR_H; break; case 0x1653: /* (green steel) */ - element = EL_CHAR_I; + element = EL_STEEL_CHAR_I; break; case 0x1654: /* (green steel) */ - element = EL_CHAR_J; + element = EL_STEEL_CHAR_J; break; case 0x1655: /* (green steel) */ - element = EL_CHAR_K; + element = EL_STEEL_CHAR_K; break; case 0x1656: /* (green steel) */ - element = EL_CHAR_L; + element = EL_STEEL_CHAR_L; break; case 0x1657: /* (green steel) */ - element = EL_CHAR_M; + element = EL_STEEL_CHAR_M; break; case 0x1658: /* (green steel) */ - element = EL_CHAR_N; + element = EL_STEEL_CHAR_N; break; case 0x1659: /* (green steel) */ - element = EL_CHAR_O; + element = EL_STEEL_CHAR_O; break; case 0x165a: /* (green steel) */ - element = EL_CHAR_P; + element = EL_STEEL_CHAR_P; break; case 0x165b: /* (green steel) */ - element = EL_CHAR_Q; + element = EL_STEEL_CHAR_Q; break; case 0x165c: /* (green steel) */ - element = EL_CHAR_R; + element = EL_STEEL_CHAR_R; break; case 0x165d: /* (green steel) */ - element = EL_CHAR_S; + element = EL_STEEL_CHAR_S; break; case 0x165e: /* (green steel) */ - element = EL_CHAR_T; + element = EL_STEEL_CHAR_T; break; case 0x165f: /* (green steel) */ - element = EL_CHAR_U; + element = EL_STEEL_CHAR_U; break; case 0x1660: /* (green steel) */ - element = EL_CHAR_V; + element = EL_STEEL_CHAR_V; break; case 0x1661: /* (green steel) */ - element = EL_CHAR_W; + element = EL_STEEL_CHAR_W; break; case 0x1662: /* (green steel) */ - element = EL_CHAR_X; + element = EL_STEEL_CHAR_X; break; case 0x1663: /* (green steel) */ - element = EL_CHAR_Y; + element = EL_STEEL_CHAR_Y; break; case 0x1664: /* (green steel) */ - element = EL_CHAR_Z; + element = EL_STEEL_CHAR_Z; break; case 0x1665: /* (green steel) */ - element = EL_CHAR_AUMLAUT; + element = EL_STEEL_CHAR_AUMLAUT; break; case 0x1666: /* (green steel) */ - element = EL_CHAR_OUMLAUT; + element = EL_STEEL_CHAR_OUMLAUT; break; case 0x1667: /* (green steel) */ - element = EL_CHAR_UUMLAUT; + element = EL_STEEL_CHAR_UUMLAUT; break; case 0x1668: /* (green steel) */ - element = EL_CHAR_0; + element = EL_STEEL_CHAR_0; break; case 0x1669: /* (green steel) */ - element = EL_CHAR_1; + element = EL_STEEL_CHAR_1; break; case 0x166a: /* (green steel) */ - element = EL_CHAR_2; + element = EL_STEEL_CHAR_2; break; case 0x166b: /* (green steel) */ - element = EL_CHAR_3; + element = EL_STEEL_CHAR_3; break; case 0x166c: /* (green steel) */ - element = EL_CHAR_4; + element = EL_STEEL_CHAR_4; break; case 0x166d: /* (green steel) */ - element = EL_CHAR_5; + element = EL_STEEL_CHAR_5; break; case 0x166e: /* (green steel) */ - element = EL_CHAR_6; + element = EL_STEEL_CHAR_6; break; case 0x166f: /* (green steel) */ - element = EL_CHAR_7; + element = EL_STEEL_CHAR_7; break; case 0x1670: /* (green steel) */ - element = EL_CHAR_8; + element = EL_STEEL_CHAR_8; break; case 0x1671: /* (green steel) */ - element = EL_CHAR_9; + element = EL_STEEL_CHAR_9; break; case 0x1672: /* (green steel) */ - element = EL_CHAR_PERIOD; + element = EL_STEEL_CHAR_PERIOD; break; case 0x1673: /* (green steel) */ - element = EL_CHAR_EXCLAM; + element = EL_STEEL_CHAR_EXCLAM; break; case 0x1674: /* (green steel) */ - element = EL_CHAR_COLON; + element = EL_STEEL_CHAR_COLON; break; case 0x1675: /* (green steel) */ - element = EL_CHAR_LESS; + element = EL_STEEL_CHAR_LESS; break; case 0x1676: /* (green steel) */ - element = EL_CHAR_GREATER; + element = EL_STEEL_CHAR_GREATER; break; case 0x1677: /* (green steel) */ - element = EL_CHAR_QUESTION; + element = EL_STEEL_CHAR_QUESTION; break; case 0x1678: /* (green steel) */ - element = EL_CHAR_COPYRIGHT; + element = EL_STEEL_CHAR_COPYRIGHT; break; case 0x1679: /* (green steel) */ - element = EL_CHAR_ASCIICIRCUM; + element = EL_STEEL_CHAR_UP; break; case 0x167a: /* (green steel) */ - element = EL_CHAR_UNDERSCORE; + element = EL_STEEL_CHAR_DOWN; break; case 0x167b: /* (green steel) */ - element = EL_CHAR_ASTERISK; + element = EL_STEEL_CHAR_BUTTON; break; case 0x167c: /* (green steel) */ - element = EL_CHAR_PLUS; + element = EL_STEEL_CHAR_PLUS; break; case 0x167d: /* (green steel) */ - element = EL_CHAR_MINUS; + element = EL_STEEL_CHAR_MINUS; break; case 0x167e: /* (green steel) */ - element = EL_CHAR_APOSTROPHE; + element = EL_STEEL_CHAR_APOSTROPHE; break; case 0x167f: /* (green steel) */ - element = EL_CHAR_PARENLEFT; + element = EL_STEEL_CHAR_PARENLEFT; break; case 0x1680: /* (green steel) */ - element = EL_CHAR_PARENRIGHT; + element = EL_STEEL_CHAR_PARENRIGHT; break; case 0x1681: /* gate (red) */ @@ -5294,15 +5310,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: @@ -5310,7 +5326,7 @@ int getMappedElement_DC(int element) break; case 0x168d: - element = EL_TIMEGATE_SWITCH; + element = EL_DC_TIMEGATE_SWITCH; break; case 0x168e: @@ -5346,87 +5362,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: @@ -5450,7 +5466,7 @@ int getMappedElement_DC(int element) break; case 0x16b0: - element = EL_SIGN_ONEWAY; + element = EL_SIGN_NO_ENTRY; break; case 0x16b1: @@ -5458,19 +5474,19 @@ int getMappedElement_DC(int element) break; case 0x16b2: - element = EL_SIGN_TRIANGLE; + element = EL_SIGN_GIVE_WAY; break; case 0x16b3: - element = EL_SIGN_ROUND; + element = EL_SIGN_ENTRY_FORBIDDEN; break; case 0x16b4: - element = EL_SIGN_EXIT; + element = EL_SIGN_EMERGENCY_EXIT; break; case 0x16b5: - element = EL_SIGN_YINYANG; + element = EL_SIGN_YIN_YANG; break; case 0x16b6: @@ -5509,14 +5525,14 @@ int getMappedElement_DC(int element) break; default: - if (element >= 0x0118 && element <= 0x036c) /* (?) */ + if (element >= 0x0117 && element <= 0x036e) /* (?) */ element = EL_DIAMOND; else if (element >= 0x042d && element <= 0x0684) /* (?) */ element = EL_EMERALD; else if (element >= 0x157c && element <= 0x158b) element = EL_SAND; else if (element >= 0x1590 && element <= 0x159f) - element = EL_LANDMINE; + element = EL_DC_LANDMINE; else if (element >= 0x16bc && element <= 0x16cb) element = EL_INVISIBLE_SAND; else @@ -5615,6 +5631,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'; @@ -5695,6 +5716,33 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, level->shield_normal_time = header[58] | (header[59] << 8); fclose(file); + + /* Diamond Caves has the same (strange) behaviour as Emerald Mine that gems + can slip down from flat walls, like normal walls and steel walls */ + level->em_slippery_gems = TRUE; + +#if 0 + /* Diamond Caves II levels are always surrounded by indestructible wall, but + not necessarily in a rectangular way -- fill with invisible steel wall */ + + /* !!! not always true !!! keep level and set BorderElement instead !!! */ + + 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 + } +#endif } @@ -5905,6 +5953,10 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) change->target_element == EL_SOKOBAN_FIELD_PLAYER) change->target_element = EL_PLAYER_1; } + + /* not centering level after relocating player was default only in 3.2.3 */ + if (level->game_version == VERSION_IDENT(3,2,3,0)) /* (no pre-releases) */ + level->shifted_relocation = TRUE; } static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) @@ -6058,7 +6110,10 @@ static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename) lev_fieldy = level->fieldy; /* determine border element for this level */ - SetBorderElement(); + if (level->file_info.type == LEVEL_FILE_TYPE_DC) + BorderElement = EL_EMPTY; /* (in editor, SetBorderElement() is used) */ + else + SetBorderElement(); } static void LoadLevel_InitNativeEngines(struct LevelInfo *level,char *filename) @@ -7645,14 +7700,15 @@ void SaveScore(int nr) #define SETUP_TOKEN_QUICK_SWITCH 20 #define SETUP_TOKEN_INPUT_ON_FOCUS 21 #define SETUP_TOKEN_PREFER_AGA_GRAPHICS 22 -#define SETUP_TOKEN_GRAPHICS_SET 23 -#define SETUP_TOKEN_SOUNDS_SET 24 -#define SETUP_TOKEN_MUSIC_SET 25 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 26 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 27 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 28 +#define SETUP_TOKEN_GAME_FRAME_DELAY 23 +#define SETUP_TOKEN_GRAPHICS_SET 24 +#define SETUP_TOKEN_SOUNDS_SET 25 +#define SETUP_TOKEN_MUSIC_SET 26 +#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 27 +#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 28 +#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 29 -#define NUM_GLOBAL_SETUP_TOKENS 29 +#define NUM_GLOBAL_SETUP_TOKENS 30 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 @@ -7664,15 +7720,16 @@ 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_CUSTOM 9 -#define SETUP_TOKEN_EDITOR_EL_HEADLINES 10 -#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED 11 -#define SETUP_TOKEN_EDITOR_EL_DYNAMIC 12 -#define SETUP_TOKEN_EDITOR_EL_BY_GAME 13 -#define SETUP_TOKEN_EDITOR_EL_BY_TYPE 14 -#define SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN 15 +#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 +#define SETUP_TOKEN_EDITOR_EL_DYNAMIC 13 +#define SETUP_TOKEN_EDITOR_EL_BY_GAME 14 +#define SETUP_TOKEN_EDITOR_EL_BY_TYPE 15 +#define SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN 16 -#define NUM_EDITOR_SETUP_TOKENS 16 +#define NUM_EDITOR_SETUP_TOKENS 17 /* editor cascade setup */ #define SETUP_TOKEN_EDITOR_CASCADE_BD 0 @@ -7684,13 +7741,14 @@ void SaveScore(int nr) #define SETUP_TOKEN_EDITOR_CASCADE_DC 6 #define SETUP_TOKEN_EDITOR_CASCADE_DX 7 #define SETUP_TOKEN_EDITOR_CASCADE_TEXT 8 -#define SETUP_TOKEN_EDITOR_CASCADE_CE 9 -#define SETUP_TOKEN_EDITOR_CASCADE_GE 10 -#define SETUP_TOKEN_EDITOR_CASCADE_REF 11 -#define SETUP_TOKEN_EDITOR_CASCADE_USER 12 -#define SETUP_TOKEN_EDITOR_CASCADE_DYNAMIC 13 +#define SETUP_TOKEN_EDITOR_CASCADE_STEELTEXT 9 +#define SETUP_TOKEN_EDITOR_CASCADE_CE 10 +#define SETUP_TOKEN_EDITOR_CASCADE_GE 11 +#define SETUP_TOKEN_EDITOR_CASCADE_REF 12 +#define SETUP_TOKEN_EDITOR_CASCADE_USER 13 +#define SETUP_TOKEN_EDITOR_CASCADE_DYNAMIC 14 -#define NUM_EDITOR_CASCADE_SETUP_TOKENS 14 +#define NUM_EDITOR_CASCADE_SETUP_TOKENS 15 /* shortcut setup */ #define SETUP_TOKEN_SHORTCUT_SAVE_GAME 0 @@ -7725,10 +7783,11 @@ void SaveScore(int nr) #define NUM_PLAYER_SETUP_TOKENS 16 /* system setup */ -#define SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER 0 -#define SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE 1 +#define SETUP_TOKEN_SYSTEM_SDL_VIDEODRIVER 0 +#define SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER 1 +#define SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE 2 -#define NUM_SYSTEM_SETUP_TOKENS 2 +#define NUM_SYSTEM_SETUP_TOKENS 3 /* options setup */ #define SETUP_TOKEN_OPTIONS_VERBOSE 0 @@ -7769,6 +7828,7 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.quick_switch, "quick_player_switch" }, { TYPE_SWITCH, &si.input_on_focus, "input_on_focus" }, { TYPE_SWITCH, &si.prefer_aga_graphics, "prefer_aga_graphics" }, + { TYPE_INTEGER,&si.game_frame_delay, "game_frame_delay" }, { TYPE_STRING, &si.graphics_set, "graphics_set" }, { TYPE_STRING, &si.sounds_set, "sounds_set" }, { TYPE_STRING, &si.music_set, "music_set" }, @@ -7800,6 +7860,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_steel_chars, "editor.el_steel_chars" }, { TYPE_SWITCH, &sei.el_custom, "editor.el_custom" }, #if 1 { TYPE_SWITCH, ¬_used, "editor.el_headlines" }, @@ -7824,6 +7885,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_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" }, @@ -7865,6 +7927,7 @@ static struct TokenInfo player_setup_tokens[] = static struct TokenInfo system_setup_tokens[] = { + { TYPE_STRING, &syi.sdl_videodriver, "system.sdl_videodriver" }, { TYPE_STRING, &syi.sdl_audiodriver, "system.sdl_audiodriver" }, { TYPE_INTEGER, &syi.audio_fragment_size,"system.audio_fragment_size" }, }; @@ -7919,6 +7982,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->quick_switch = FALSE; si->input_on_focus = FALSE; si->prefer_aga_graphics = TRUE; + si->game_frame_delay = GAME_FRAME_DELAY; si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR); si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR); @@ -7927,16 +7991,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_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; @@ -7944,15 +8009,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++) { @@ -7974,6 +8039,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->input[i].key.drop = (i == 0 ? DEFAULT_KEY_DROP : KSYM_UNDEFINED); } + si->system.sdl_videodriver = getStringCopy(ARG_DEFAULT); si->system.sdl_audiodriver = getStringCopy(ARG_DEFAULT); si->system.audio_fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; @@ -7982,21 +8048,22 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si) { - si->editor_cascade.el_bd = TRUE; - si->editor_cascade.el_em = TRUE; - si->editor_cascade.el_emc = TRUE; - si->editor_cascade.el_rnd = TRUE; - si->editor_cascade.el_sb = TRUE; - si->editor_cascade.el_sp = TRUE; - si->editor_cascade.el_dc = TRUE; - si->editor_cascade.el_dx = TRUE; + si->editor_cascade.el_bd = TRUE; + si->editor_cascade.el_em = TRUE; + si->editor_cascade.el_emc = TRUE; + si->editor_cascade.el_rnd = TRUE; + si->editor_cascade.el_sb = TRUE; + si->editor_cascade.el_sp = TRUE; + si->editor_cascade.el_dc = TRUE; + si->editor_cascade.el_dx = TRUE; - si->editor_cascade.el_chars = FALSE; - si->editor_cascade.el_ce = FALSE; - si->editor_cascade.el_ge = FALSE; - si->editor_cascade.el_ref = FALSE; - si->editor_cascade.el_user = FALSE; - si->editor_cascade.el_dynamic = FALSE; + si->editor_cascade.el_chars = 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; + si->editor_cascade.el_user = FALSE; + si->editor_cascade.el_dynamic = FALSE; } static void decodeSetupFileHash(SetupFileHash *setup_file_hash) @@ -8265,8 +8332,43 @@ void LoadCustomElementDescriptions() static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) { + static struct TitleMessageInfo tmi; + static struct TokenInfo titlemessage_tokens[] = + { + { TYPE_INTEGER, &tmi.x, ".x" }, + { TYPE_INTEGER, &tmi.y, ".y" }, + { TYPE_INTEGER, &tmi.width, ".width" }, + { TYPE_INTEGER, &tmi.height, ".height" }, + { TYPE_INTEGER, &tmi.chars, ".chars" }, + { TYPE_INTEGER, &tmi.lines, ".lines" }, + { TYPE_INTEGER, &tmi.align, ".align" }, + { TYPE_INTEGER, &tmi.valign, ".valign" }, + { TYPE_INTEGER, &tmi.font, ".font" }, + { TYPE_BOOLEAN, &tmi.autowrap, ".autowrap" }, + { TYPE_BOOLEAN, &tmi.centered, ".centered" }, + { TYPE_BOOLEAN, &tmi.parse_comments, ".parse_comments" }, + { TYPE_INTEGER, &tmi.sort_priority, ".sort_priority" }, + { TYPE_INTEGER, &tmi.fade_mode, ".fade_mode" }, + { TYPE_INTEGER, &tmi.fade_delay, ".fade_delay" }, + { TYPE_INTEGER, &tmi.post_delay, ".post_delay" }, + { TYPE_INTEGER, &tmi.auto_delay, ".auto_delay" }, + + { -1, NULL, NULL } + }; + static struct + { + struct TitleMessageInfo *array; + char *text; + } + titlemessage_arrays[] = + { + { titlemessage_initial, "[titlemessage_initial]" }, + { titlemessage, "[titlemessage]" }, + + { NULL, NULL } + }; SetupFileHash *setup_file_hash; - int i; + int i, j, k; #if 0 printf("LoadSpecialMenuDesignSettings from file '%s' ...\n", filename); @@ -8275,31 +8377,68 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) if ((setup_file_hash = loadSetupFileHash(filename)) == NULL) return; + /* the following initializes hierarchical values from dynamic configuration */ + /* special case: initialize with default values that may be overwritten */ + /* (e.g., init "menu.draw_xoffset.INFO" from "menu.draw_xoffset") */ for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) { - char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset"); - char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset"); - char *list_size = getHashEntry(setup_file_hash, "menu.list_size"); + char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset"); + char *value_2 = getHashEntry(setup_file_hash, "menu.draw_yoffset"); + char *value_3 = getHashEntry(setup_file_hash, "menu.list_size"); - if (value_x != NULL) - menu.draw_xoffset[i] = get_integer_from_string(value_x); - if (value_y != NULL) - menu.draw_yoffset[i] = get_integer_from_string(value_y); - if (list_size != NULL) - menu.list_size[i] = get_integer_from_string(list_size); + if (value_1 != NULL) + menu.draw_xoffset[i] = get_integer_from_string(value_1); + if (value_2 != NULL) + menu.draw_yoffset[i] = get_integer_from_string(value_2); + if (value_3 != NULL) + menu.list_size[i] = get_integer_from_string(value_3); } /* special case: initialize with default values that may be overwritten */ + /* (eg, init "menu.draw_xoffset.INFO[MUSIC]" from "menu.draw_xoffset.INFO") */ for (i = 0; i < NUM_SPECIAL_GFX_INFO_ARGS; i++) { - char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset.INFO"); - char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset.INFO"); + char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset.INFO"); + char *value_2 = getHashEntry(setup_file_hash, "menu.draw_yoffset.INFO"); - if (value_x != NULL) - menu.draw_xoffset_info[i] = get_integer_from_string(value_x); - if (value_y != NULL) - menu.draw_yoffset_info[i] = get_integer_from_string(value_y); + if (value_1 != NULL) + menu.draw_xoffset_info[i] = get_integer_from_string(value_1); + if (value_2 != NULL) + menu.draw_yoffset_info[i] = get_integer_from_string(value_2); + } + + /* special case: initialize with default values that may be overwritten */ + /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */ + for (i = 0; titlemessage_arrays[i].array != NULL; i++) + { + struct TitleMessageInfo *array = titlemessage_arrays[i].array; + char *base_token = titlemessage_arrays[i].text; + + for (j = 0; titlemessage_tokens[j].type != -1; j++) + { + char *token = getStringCat2(base_token, titlemessage_tokens[j].text); + char *value = getHashEntry(setup_file_hash, token); + + if (value != NULL) + { + int parameter_value = get_token_parameter_value(token, value); + + for (k = 0; k < MAX_NUM_TITLE_MESSAGES; k++) + { + tmi = array[k]; + + if (titlemessage_tokens[j].type == TYPE_INTEGER) + *(boolean *)titlemessage_tokens[j].value = (boolean)parameter_value; + else + *(int *)titlemessage_tokens[j].value = (int)parameter_value; + + array[k] = tmi; + } + } + + free(token); + } } /* read (and overwrite with) values that may be specified in config file */ @@ -8309,7 +8448,7 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) if (value != NULL) *image_config_vars[i].value = - get_auto_parameter_value(image_config_vars[i].token, value); + get_token_parameter_value(image_config_vars[i].token, value); } freeSetupFileHash(setup_file_hash); @@ -8320,13 +8459,34 @@ void LoadSpecialMenuDesignSettings() char *filename_base = UNDEFINED_FILENAME, *filename_local; int i, j; - /* always start with reliable default values from default config */ + /* always start with reliable default values from static default config */ for (i = 0; image_config_vars[i].token != NULL; i++) for (j = 0; image_config[j].token != NULL; j++) if (strEqual(image_config_vars[i].token, image_config[j].token)) *image_config_vars[i].value = - get_auto_parameter_value(image_config_vars[i].token, - image_config[j].value); + get_token_parameter_value(image_config_vars[i].token, + image_config[j].value); + + /* the following initializes hierarchical values from static configuration */ + + /* special case: initialize "ARG_DEFAULT" values in static default config */ + /* (e.g., initialize "[titlemessage].fade_mode" from "[title].fade_mode") */ + titlemessage_initial_default.fade_mode = title_initial_default.fade_mode; + titlemessage_initial_default.fade_delay = title_initial_default.fade_delay; + titlemessage_initial_default.post_delay = title_initial_default.post_delay; + titlemessage_initial_default.auto_delay = title_initial_default.auto_delay; + titlemessage_default.fade_mode = title_default.fade_mode; + titlemessage_default.fade_delay = title_default.fade_delay; + titlemessage_default.post_delay = title_default.post_delay; + titlemessage_default.auto_delay = title_default.auto_delay; + + /* special case: initialize "ARG_DEFAULT" values in static default config */ + /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */ + for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++) + { + titlemessage_initial[i] = titlemessage_initial_default; + titlemessage[i] = titlemessage_default; + } if (!SETUP_OVERRIDE_ARTWORK(setup, ARTWORK_TYPE_GRAPHICS)) { @@ -8398,19 +8558,19 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) { if (num_unknown_tokens == 0) { - Error(ERR_RETURN_LINE, "-"); - Error(ERR_RETURN, "warning: unknown token(s) found in config file:"); - Error(ERR_RETURN, "- config file: '%s'", filename); + Error(ERR_INFO_LINE, "-"); + Error(ERR_INFO, "warning: unknown token(s) found in config file:"); + Error(ERR_INFO, "- config file: '%s'", filename); num_unknown_tokens++; } - Error(ERR_RETURN, "- token: '%s'", list->token); + Error(ERR_INFO, "- token: '%s'", list->token); } } if (num_unknown_tokens > 0) - Error(ERR_RETURN_LINE, "-"); + Error(ERR_INFO_LINE, "-"); while (*num_elements % 4) /* pad with empty elements, if needed */ (*elements)[(*num_elements)++] = EL_EMPTY; @@ -8711,18 +8871,18 @@ void print_unknown_token(char *filename, char *token, int token_nr) { if (token_nr == 0) { - Error(ERR_RETURN_LINE, "-"); - Error(ERR_RETURN, "warning: unknown token(s) found in config file:"); - Error(ERR_RETURN, "- config file: '%s'", filename); + Error(ERR_INFO_LINE, "-"); + Error(ERR_INFO, "warning: unknown token(s) found in config file:"); + Error(ERR_INFO, "- config file: '%s'", filename); } - Error(ERR_RETURN, "- token: '%s'", token); + Error(ERR_INFO, "- token: '%s'", token); } void print_unknown_token_end(int token_nr) { if (token_nr > 0) - Error(ERR_RETURN_LINE, "-"); + Error(ERR_INFO_LINE, "-"); } void LoadHelpAnimInfo()