X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fconvert.c;h=6aac3b7d4db789b8f3d711a78096906f65658436;hb=1e4a6b46371858fdb85052eec3e7143732ff91b5;hp=245922f7f21af92e93f7eff6524a312fce4a83fd;hpb=c5321d9d36d0a74062651d0352fbbaccbe125eca;p=rocksndiamonds.git diff --git a/src/game_em/convert.c b/src/game_em/convert.c index 245922f7..6aac3b7d 100644 --- a/src/game_em/convert.c +++ b/src/game_em/convert.c @@ -17,66 +17,75 @@ static unsigned char remap_v6[256] = { /* filter crap for v6 */ - 0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15, - 16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28, - 0,16,2,18,36,37,37,37,40,41,42,43,44,45,128,128, - 128,148,148,148,45,45,45,148,0,57,58,59,60,61,62,63, - 64,65,66,67,68,69,69,69,69,73,74,75,118,75,75,75, - 75,75,75,75,75,153,153,153,153,153,153,153,153,153,153,153, - 153,153,153,99,100,68,68,68,68,68,68,68,68,118,118,118, - 118,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118, - 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, - 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, - 160,161,162,163,164,165,165,118,168,169,170,171,172,173,174,175, - 176,177,178,179,180,181,182,183,184,185,186,187,188,189,68,191, - 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207, - 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, - 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, - 240,241,242,243,244,245,153,153,153,153,153,153,153,153,153,153 + 0,0,2,2, 4,4,118,118, 8,9,10,11, 12,13,14,15, + 16,16,18,18, 20,21,22,23, 24,25,26,27, 28,28,118,28, + 0,16,2,18, 36,37,37,37, 40,41,42,43, 44,45,128,128, + 128,148,148, 148,45,45,45, 148,0,57,58, 59,60,61,62,63, + + 64,65,66,67, 68,69,69,69, 69,73,74,75, 118,75,75,75, + 75,75,75,75, 75,153,153,153, 153,153,153,153, 153,153,153,153, + 153,153,153,99, 100,68,68,68, 68,68,68,68, 68,118,118,118, + 118,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118, + + 128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143, + 144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159, + 160,161,162,163, 164,165,165,118, 168,169,170,171, 172,173,174,175, + 176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,68,191, + + 192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207, + 208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223, + 224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239, + 240,241,242,243, 244,245,153,153, 153,153,153,153, 153,153,153,153 }; static unsigned char remap_v5[256] = { /* filter crap for v5 */ - 0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15, - 16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28, - 0,16,2,18,36,37,37,37,147,41,42,43,44,45,128,128, - 128,148,148,148,45,45,45,148,0,57,58,59,60,61,62,63, - 64,65,66,67,68,153,153,153,153,153,153,153,153,153,153,153, - 153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153, - 153,153,153,153,153,68,68,68,68,68,68,68,68,118,118,118, - 118,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118, - 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, - 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, - 160,153,153,153,153,153,153,118,168,169,170,171,172,173,174,175, - 176,177,178,179,180,181,182,183,184,185,186,187,188,189,68,153, - 153,153,153,153,153,153,153,153,200,201,202,203,204,205,206,207, - 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, - 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, - 240,241,153,153,153,153,153,153,153,153,153,153,153,153,153,153 + 0,0,2,2, 4,4,118,118, 8,9,10,11, 12,13,14,15, + 16,16,18,18, 20,21,22,23, 24,25,26,27, 28,28,118,28, + 0,16,2,18, 36,37,37,37, 147,41,42,43, 44,45,128,128, + 128,148,148,148, 45,45,45,148, 0,57,58,59, 60,61,62,63, + + 64,65,66,67, 68,153,153,153, 153,153,153,153, 153,153,153,153, + 153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153, + 153,153,153,153, 153,68,68,68,68, 68,68,68,68,118, 118,118, + 118,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118, + + 128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143, + 144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159, + 160,153,153,153, 153,153,153,118, 168,169,170,171, 172,173,174,175, + 176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,68,153, + + 153,153,153,153, 153,153,153,153, 200,201,202,203, 204,205,206,207, + 208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223, + 224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239, + 240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153 }; static unsigned char remap_v4[256] = { /* filter crap for v4 */ - 0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15, - 16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28, - 0,16,2,18,36,37,37,37,147,41,42,43,44,45,128,128, - 128,148,148,148,45,45,45,148,0,153,153,59,60,61,62,63, - 64,65,66,153,153,153,153,153,153,153,153,153,153,153,153,153, - 153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153, - 153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153, - 153,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118, - 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, - 144,145,146,147,148,149,150,151,152,68,154,155,156,157,158,160, - 160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,175, - 153,153,153,153,153,153,153,153,153,153,153,153,153,153,68,153, - 153,153,153,153,153,153,153,153,200,201,202,203,204,205,206,207, - 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, - 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, - 240,241,153,153,153,153,153,153,153,153,153,153,153,153,153,153 + 0,0,2,2, 4,4,118,118, 8,9,10,11, 12,13,14,15, + 16,16,18,18, 20,21,22,23, 24,25,26,27, 28,28,118,28, + 0,16,2,18, 36,37,37,37, 147,41,42,43, 44,45,128,128, + 128,148,148,148, 45,45,45,148, 0,153,153,59, 60,61,62,63, + + 64,65,66,153, 153,153,153,153, 153,153,153,153, 153,153,153,153, + 153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153, + 153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153, + 153,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118, + + 128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143, + 144,145,146,147, 148,149,150,151, 152,68,154,155, 156,157,158,160, + 160,160,160,160, 160,160,160,160, 160,160,160,160, 160,160,160,175, + 153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,68,153, + + 153,153,153,153, 153,153,153,153, 200,201,202,203, 204,205,206,207, + 208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223, + 224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239, + 240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153 }; static unsigned char remap_v4eater[28] = @@ -88,60 +97,68 @@ static unsigned char remap_v4eater[28] = 146,147,175,65,66,64,2,18 }; -boolean cleanup_em_level(unsigned char *src, int *length) +int cleanup_em_level(unsigned char *src, int length) { - unsigned int i; + int file_version = 0; + int i; - if (*length >= 2172 && + if (length >= 2172 && src[2106] == 255 && src[2107] == 54 && src[2108] == 48 && src[2109] == 48) { + /* ---------- this cave has V6 file format ---------- */ + file_version = FILE_VERSION_EM_V6; + for (i = 0; i < 2048; i++) src[i] = remap_v6[src[i]]; for (i = 2048; i < 2084; i++) src[i] = remap_v6[src[i]]; for (i = 2112; i < 2148; i++) src[i] = remap_v6[src[i]]; - - goto v6; } - - if (*length >= 2110 && - src[2106] == 255 && - src[2107] == 53 && - src[2108] == 48 && - src[2109] == 48) + else if (length >= 2110 && + src[2106] == 255 && + src[2107] == 53 && + src[2108] == 48 && + src[2109] == 48) { + /* ---------- this cave has V5 file format ---------- */ + file_version = FILE_VERSION_EM_V5; + for (i = 0; i < 2048; i++) src[i] = remap_v5[src[i]]; for (i = 2048; i < 2084; i++) src[i] = remap_v5[src[i]]; for (i = 2112; i < 2148; i++) src[i] = src[i - 64]; - - goto v5; } - - if (*length >= 2106 && - src[1983] == 116) +#if 0 + else if (length >= 2106) /* !!! TEST ONLY: SHOW BROKEN LEVELS !!! */ +#else + else if (length >= 2106 && + src[1983] == 116) +#endif { + /* ---------- this cave has V4 file format ---------- */ + file_version = FILE_VERSION_EM_V4; + for (i = 0; i < 2048; i++) src[i] = remap_v4[src[i]]; for (i = 2048; i < 2084; i++) src[i] = remap_v4eater[src[i] >= 28 ? 0 : src[i]]; for (i = 2112; i < 2148; i++) src[i] = src[i - 64]; - - goto v4; } - - if (*length >= 2106 && - src[0] == 241 && - src[1983] == 27) + else if (length >= 2106 && + src[0] == 241 && + src[1983] == 27) { unsigned char j = 94; + /* ---------- this cave has V3 file format ---------- */ + file_version = FILE_VERSION_EM_V3; + for (i = 0; i < 2106; i++) src[i] = (src[i] ^ (j += 7)) - 0x11; src[1] = 131; @@ -151,34 +168,60 @@ boolean cleanup_em_level(unsigned char *src, int *length) src[i] = remap_v4eater[src[i] >= 28 ? 0 : src[i]]; for (i = 2112; i < 2148; i++) src[i] = src[i - 64]; - - goto v3; } +#if 1 + else if (length >= 2106 && + src[0] == 245 && + src[1983] == 27) + { + unsigned char j = 94; - return FALSE; /* unrecognized cave */ - - v3: - v4: - v5: + /* ---------- this cave has V3 file format ---------- */ + file_version = FILE_VERSION_EM_V3; - /* id */ - src[2106] = 255; - src[2107] = 54; - src[2108] = 48; - src[2109] = 48; + for (i = 0; i < 2106; i++) + src[i] = (src[i] ^ (j += 7)) - 0x11; + src[1] = 131; + for (i = 0; i < 2048; i++) + src[i] = remap_v4[src[i]]; + for (i = 2048; i < 2084; i++) + src[i] = remap_v4eater[src[i] >= 28 ? 0 : src[i]]; + for (i = 2112; i < 2148; i++) + src[i] = src[i - 64]; + } +#endif + else + { + /* ---------- this cave has unknown file format ---------- */ - /* time */ - i = src[2094] * 10; - src[2110] = i >> 8; - src[2111] = i; +#if 1 + printf("::: %d, %d\n", src[0], src[1983]); +#endif - for (i = 2148; i < 2172; i++) - src[i] = 0; + return 0; + } - /* ball data */ - src[2159] = 128; + if (file_version < FILE_VERSION_EM_V6) + { + /* id */ + src[2106] = 255; + src[2107] = 54; + src[2108] = 48; + src[2109] = 48; + + /* time */ + i = src[2094] * 10; + src[2110] = i >> 8; + src[2111] = i; + + for (i = 2148; i < 2172; i++) + src[i] = 0; + + /* ball data */ + src[2159] = 128; + } - v6: + /* ---------- at this stage, the cave data always has V6 format ---------- */ /* fix wheel */ for (i = 0; i < 2048; i++) @@ -188,10 +231,27 @@ boolean cleanup_em_level(unsigned char *src, int *length) if (src[i] == 40) src[i] = 147; +#if 0 /* fix acid */ for (i = 64; i < 2048; i++) - if (src[i] == 63) - src[i - 64] = 101; + if (src[i] == 63) /* replace element above 'Xacid_s' ... */ + src[i - 64] = 101; /* ... with 'Xacid_1' */ + +#else + + /* fix acid */ + for (i = 64; i < 2048; i++) + { + 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; /* replace element above with 'Xfake_acid_1' */ + else + src[i - 64] = 101; /* replace element above with 'Xacid_1' */ + } + } +#endif /* fix acid in eater 1 */ for (i = 2051; i < 2057; i++) @@ -244,7 +304,7 @@ boolean cleanup_em_level(unsigned char *src, int *length) src[2098] &= 7; src[src[2098] << 8 | src[2099]] = 128; - /* ameuba speed */ + /* amoeba speed */ if ((src[2100] << 8 | src[2101]) > 9999) { src[2100] = 39; @@ -319,9 +379,13 @@ boolean cleanup_em_level(unsigned char *src, int *length) src[2168] &= 31; /* size of v6 cave */ - *length = 2172; + length = 2172; - return TRUE; +#if 1 + printf("::: EM level file version: %d\n", file_version); +#endif + + return file_version; } /* 2000-07-30T00:26:00Z @@ -341,7 +405,8 @@ boolean cleanup_em_level(unsigned char *src, int *length) * rolls. * - a compile time option for rolling objects (stone, nut, spring, bomb) only * in eater. - * - acid is always deadly even with no base beneath it. + * - acid is always deadly even with no base beneath it (this breaks cave 0 in + * downunder mine 16) * * so far all below have not broken any caves: * @@ -374,61 +439,127 @@ boolean cleanup_em_level(unsigned char *src, int *length) static unsigned short remap_emerald[256] = { - Xstone, Xstone, Xdiamond, Xdiamond, Xalien, Xalien, Xblank, Xblank, - Xtank_n, Xtank_e, Xtank_s, Xtank_w, Xtank_gon, Xtank_goe, Xtank_gos, Xtank_gow, - Xbomb, Xbomb, Xemerald, Xemerald, Xbug_n, Xbug_e, Xbug_s, Xbug_w, - Xbug_gon, Xbug_goe, Xbug_gos, Xbug_gow, Xdrip_eat, Xdrip_eat, Xdrip_eat, Xdrip_eat, - Xstone, Xbomb, Xdiamond, Xemerald, Xwonderwall, Xnut, Xnut, Xnut, - Xwheel, Xeater_n, Xeater_s, Xeater_w, Xeater_e, Xsand_stone, Xblank, Xblank, - Xblank, Xsand, Xsand, Xsand, Xsand_stone, Xsand_stone, Xsand_stone, Xsand, - Xstone, Xgrow_ew, Xgrow_ns, Xdynamite_1, Xdynamite_2, Xdynamite_3, Xdynamite_4, Xacid_s, - Xexit_1, Xexit_2, Xexit_3, Xballoon, Xplant, Xspring, Xspring, Xspring, - Xspring, Xball_1, Xball_2, Xandroid, Xblank, Xandroid, Xandroid, Xandroid, - Xandroid, Xandroid, Xandroid, Xandroid, Xandroid, Xblank, Xblank, Xblank, - Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, + Xstone, Xstone, Xdiamond, Xdiamond, + Xalien, Xalien, Xblank, Xblank, + Xtank_n, Xtank_e, Xtank_s, Xtank_w, + Xtank_gon, Xtank_goe, Xtank_gos, Xtank_gow, + + Xbomb, Xbomb, Xemerald, Xemerald, + Xbug_n, Xbug_e, Xbug_s, Xbug_w, + Xbug_gon, Xbug_goe, Xbug_gos, Xbug_gow, + Xdrip_eat, Xdrip_eat, Xdrip_eat, Xdrip_eat, + + Xstone, Xbomb, Xdiamond, Xemerald, + Xwonderwall, Xnut, Xnut, Xnut, + Xwheel, Xeater_n, Xeater_s, Xeater_w, + Xeater_e, Xsand_stone, Xblank, Xblank, + + Xblank, Xsand, Xsand, Xsand, + Xsand_stone, Xsand_stone, Xsand_stone, Xsand, + Xstone, Xgrow_ew, Xgrow_ns, Xdynamite_1, + Xdynamite_2, Xdynamite_3, Xdynamite_4, Xacid_s, + + Xexit_1, Xexit_2, Xexit_3, Xballoon, + Xplant, Xspring, Xspring, Xspring, + Xspring, Xball_1, Xball_2, Xandroid, + Xblank, Xandroid, Xandroid, Xandroid, + + Xandroid, Xandroid, Xandroid, Xandroid, + Xandroid, Xblank, Xblank, Xblank, + Xblank, Xblank, Xblank, Xblank, + Xblank, Xblank, Xblank, Xblank, #ifdef BAD_ROLL - Xblank, Xblank, Xblank, Xspring_force_w, Xspring_force_e, Xacid_1, Xacid_2, Xacid_3, - Xacid_4, Xacid_5, Xacid_6, Xacid_7, Xacid_8, Xblank, Xblank, Xblank, - Xblank, Xblank, Xnut_force_w, Xnut_force_e, Xsteel_1, Xblank, Xblank, Xbomb_force_w, - Xbomb_force_e, Xstone_force_w, Xstone_force_e, Xblank, Xblank, Xblank, Xblank, Xblank, + Xblank, Xblank, Xblank, Xspring_force_w, + Xspring_force_e, Xacid_1, Xacid_2, Xacid_3, + Xacid_4, Xacid_5, Xacid_6, Xacid_7, + Xacid_8, Xblank, Xblank, Xblank, + + Xblank, Xblank, Xnut_force_w, Xnut_force_e, + Xsteel_1, Xblank, Xblank, Xbomb_force_w, + Xbomb_force_e, Xstone_force_w, Xstone_force_e, Xblank, + Xblank, Xblank, Xblank, Xblank, #else - Xblank, Xblank, Xblank, Xspring, Xspring, Xacid_1, Xacid_2, Xacid_3, - Xacid_4, Xacid_5, Xacid_6, Xacid_7, Xacid_8, Xblank, Xblank, Xblank, - Xblank, Xblank, Xnut, Xnut, Xsteel_1, Xblank, Xblank, Xbomb, - Xbomb, Xstone, Xstone, Xblank, Xblank, Xblank, Xblank, Xblank, + Xblank, Xblank, Xblank, Xspring, + Xspring, Xacid_1, Xacid_2, Xacid_3, + Xacid_4, Xacid_5, Xacid_6, Xacid_7, + Xacid_8, Xblank, Xblank, Xblank, + + Xblank, Xblank, Xnut, Xnut, + Xsteel_1, Xblank, Xblank, Xbomb, + Xbomb, Xstone, Xstone, Xblank, + Xblank, Xblank, Xblank, Xblank, #endif - Xblank, Xround_wall_1, Xgrass, Xsteel_1, Xwall_1, Xkey_1, Xkey_2, Xkey_3, - Xkey_4, Xdoor_1, Xdoor_2, Xdoor_3, Xdoor_4, Xdripper, Xfake_door_1, Xfake_door_2, - Xfake_door_3, Xfake_door_4, Xwonderwall, Xwheel, Xsand, Xacid_nw, Xacid_ne, Xacid_sw, - Xacid_se, Xfake_blank, Xameuba_1, Xameuba_2, Xameuba_3, Xameuba_4, Xexit, Xalpha_arrow_w, - Xfake_grass, Xlenses, Xmagnify, Xfake_blank, Xfake_grass, Xswitch, Xswitch, Xblank, - Xdecor_8, Xdecor_9, Xdecor_10, Xdecor_5, Xalpha_comma, Xalpha_quote, Xalpha_minus, Xdynamite, - Xsteel_3, Xdecor_6, Xdecor_7, Xsteel_2, Xround_wall_2, Xdecor_2, Xdecor_4, Xdecor_3, - Xwind_nesw, Xwind_e, Xwind_s, Xwind_w, Xwind_n, Xdirt, Xplant, Xkey_5, - Xkey_6, Xkey_7, Xkey_8, Xdoor_5, Xdoor_6, Xdoor_7, Xdoor_8, Xbumper, - Xalpha_a, Xalpha_b, Xalpha_c, Xalpha_d, Xalpha_e, Xalpha_f, Xalpha_g, Xalpha_h, - Xalpha_i, Xalpha_j, Xalpha_k, Xalpha_l, Xalpha_m, Xalpha_n, Xalpha_o, Xalpha_p, - Xalpha_q, Xalpha_r, Xalpha_s, Xalpha_t, Xalpha_u, Xalpha_v, Xalpha_w, Xalpha_x, - Xalpha_y, Xalpha_z, Xalpha_0, Xalpha_1, Xalpha_2, Xalpha_3, Xalpha_4, Xalpha_5, - Xalpha_6, Xalpha_7, Xalpha_8, Xalpha_9, Xalpha_perio, Xalpha_excla, Xalpha_colon, Xalpha_quest, - Xalpha_arrow_e, Xdecor_1, Xfake_door_5, Xfake_door_6, Xfake_door_7, Xfake_door_8, Xblank, Xblank, - Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, + Xblank, Xround_wall_1, Xgrass, Xsteel_1, + Xwall_1, Xkey_1, Xkey_2, Xkey_3, + Xkey_4, Xdoor_1, Xdoor_2, Xdoor_3, + Xdoor_4, Xdripper, Xfake_door_1, Xfake_door_2, + + Xfake_door_3, Xfake_door_4, Xwonderwall, Xwheel, + Xsand, Xacid_nw, Xacid_ne, Xacid_sw, + Xacid_se, Xfake_blank, Xamoeba_1, Xamoeba_2, + Xamoeba_3, Xamoeba_4, Xexit, Xalpha_arrow_w, + + Xfake_grass, Xlenses, Xmagnify, Xfake_blank, + Xfake_grass, Xswitch, Xswitch, Xblank, + Xdecor_8, Xdecor_9, Xdecor_10, Xdecor_5, + Xalpha_comma, Xalpha_quote, Xalpha_minus, Xdynamite, + + Xsteel_3, Xdecor_6, Xdecor_7, Xsteel_2, + Xround_wall_2, Xdecor_2, Xdecor_4, Xdecor_3, + Xwind_nesw, Xwind_e, Xwind_s, Xwind_w, + Xwind_n, Xdirt, Xplant, Xkey_5, + + Xkey_6, Xkey_7, Xkey_8, Xdoor_5, + Xdoor_6, Xdoor_7, Xdoor_8, Xbumper, + Xalpha_a, Xalpha_b, Xalpha_c, Xalpha_d, + Xalpha_e, Xalpha_f, Xalpha_g, Xalpha_h, + + Xalpha_i, Xalpha_j, Xalpha_k, Xalpha_l, + Xalpha_m, Xalpha_n, Xalpha_o, Xalpha_p, + Xalpha_q, Xalpha_r, Xalpha_s, Xalpha_t, + Xalpha_u, Xalpha_v, Xalpha_w, Xalpha_x, + + Xalpha_y, Xalpha_z, Xalpha_0, Xalpha_1, + Xalpha_2, Xalpha_3, Xalpha_4, Xalpha_5, + Xalpha_6, Xalpha_7, Xalpha_8, Xalpha_9, + Xalpha_perio, Xalpha_excla, Xalpha_colon, Xalpha_quest, + + Xalpha_arrow_e, Xdecor_1, Xfake_door_5, Xfake_door_6, + Xfake_door_7, Xfake_door_8, Xblank, Xblank, + Xblank, Xblank, Xblank, Xblank, +#if 0 + Xblank, Xblank, Xblank, Xblank, +#else + /* special elements added to solve compatibility problems */ + Xblank, Xblank, Xblank, Xfake_acid_1 +#endif }; -void convert_em_level(unsigned char *src) +void convert_em_level(unsigned char *src, int file_version) { - unsigned int x, y, temp; - + static int eater_offset[8] = + { + 0x800, 0x809, 0x812, 0x81B, 0x840, 0x849, 0x852, 0x85B + }; + unsigned int i, x, y, temp; + +#if 1 + lev.time_seconds = src[0x83E] << 8 | src[0x83F]; + if (lev.time_seconds > 9999) + lev.time_seconds = 9999; +#else temp = ((src[0x83E] << 8 | src[0x83F]) * 25 + 3) / 4; if (temp == 0 || temp > 9999) temp = 9999; lev.time_initial = temp; +#endif + lev.required_initial = src[0x82F]; temp = src[0x830] << 8 | src[0x831]; @@ -441,7 +572,7 @@ void convert_em_level(unsigned char *src) temp = (src[0x834] << 8 | src[0x835]) * 28; if (temp > 9999) temp = 9999; - lev.ameuba_time = temp; + lev.amoeba_time = temp; lev.android_move_time = src[0x874] << 8 | src[0x875]; lev.android_clone_time = src[0x876] << 8 | src[0x877]; @@ -465,17 +596,9 @@ void convert_em_level(unsigned char *src) lev.slurp_score = src[0x869]; lev.lenses_time = src[0x86A] << 8 | src[0x86B]; - lev.lenses_cnt_initial = 0; - lev.magnify_time = src[0x86C] << 8 | src[0x86D]; - lev.magnify_cnt_initial = 0; - lev.wheel_time = src[0x838] << 8 | src[0x839]; - lev.wheel_cnt_initial = 0; - lev.wheel_x_initial = 1; - lev.wheel_y_initial = 1; - lev.wind_time = 9999; lev.wind_cnt_initial = src[0x865] & 15 ? lev.wind_time : 0; temp = src[0x865]; lev.wind_direction_initial = (temp & 8 ? 0 : @@ -483,25 +606,11 @@ void convert_em_level(unsigned char *src) temp & 2 ? 2 : temp & 4 ? 3 : 0); - lev.wonderwall_state_initial = 0; lev.wonderwall_time_initial = src[0x836] << 8 | src[0x837]; - for (x = 0; x < 9; x++) - lev.eater_array[0][x] = remap_emerald[src[0x800 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[1][x] = remap_emerald[src[0x809 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[2][x] = remap_emerald[src[0x812 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[3][x] = remap_emerald[src[0x81B + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[4][x] = remap_emerald[src[0x840 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[5][x] = remap_emerald[src[0x849 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[6][x] = remap_emerald[src[0x852 + x]]; - for (x = 0; x < 9; x++) - lev.eater_array[7][x] = remap_emerald[src[0x85B + x]]; + for (i = 0; i < 8; i++) + for (x = 0; x < 9; x++) + lev.eater_array[i][x] = remap_emerald[src[eater_offset[i] + x]]; temp = remap_emerald[src[0x86F]]; for (y = 0; y < 8; y++) @@ -513,20 +622,17 @@ void convert_em_level(unsigned char *src) } else { - lev.ball_array[y][1] = (src[0x873] & 1) ? temp : Xblank; /* north */ - lev.ball_array[y][6] = (src[0x873] & 2) ? temp : Xblank; /* south */ - lev.ball_array[y][3] = (src[0x873] & 4) ? temp : Xblank; /* west */ - lev.ball_array[y][4] = (src[0x873] & 8) ? temp : Xblank; /* east */ + lev.ball_array[y][1] = (src[0x873] & 1) ? temp : Xblank; /* north */ + lev.ball_array[y][6] = (src[0x873] & 2) ? temp : Xblank; /* south */ + lev.ball_array[y][3] = (src[0x873] & 4) ? temp : Xblank; /* west */ + lev.ball_array[y][4] = (src[0x873] & 8) ? temp : Xblank; /* east */ lev.ball_array[y][7] = (src[0x873] & 16) ? temp : Xblank; /* southeast */ lev.ball_array[y][5] = (src[0x873] & 32) ? temp : Xblank; /* southwest */ lev.ball_array[y][2] = (src[0x873] & 64) ? temp : Xblank; /* northeast */ - lev.ball_array[y][0] = (src[0x873] & 128) ? temp : Xblank;/* northwest */ + lev.ball_array[y][0] = (src[0x873] & 128)? temp : Xblank; /* northwest */ } } - for (temp = 0; temp < TILE_MAX; temp++) - lev.android_array[temp] = Xblank; - temp = src[0x878] << 8 | src[0x879]; if (temp & 1) @@ -675,14 +781,14 @@ void convert_em_level(unsigned char *src) { lev.android_array[Xdripper] = lev.android_array[XdripperB] = - lev.android_array[Xameuba_1] = - lev.android_array[Xameuba_2] = - lev.android_array[Xameuba_3] = - lev.android_array[Xameuba_4] = - lev.android_array[Xameuba_5] = - lev.android_array[Xameuba_6] = - lev.android_array[Xameuba_7] = - lev.android_array[Xameuba_8] = Xdrip_eat; + lev.android_array[Xamoeba_1] = + lev.android_array[Xamoeba_2] = + lev.android_array[Xamoeba_3] = + lev.android_array[Xamoeba_4] = + lev.android_array[Xamoeba_5] = + lev.android_array[Xamoeba_6] = + lev.android_array[Xamoeba_7] = + lev.android_array[Xamoeba_8] = Xdrip_eat; } if (temp & 4096) @@ -757,11 +863,6 @@ void convert_em_level(unsigned char *src) } } - lev.home_initial = 1; /* initial number of players in this level */ - - ply1.alive_initial = (lev.home_initial >= 1); - ply2.alive_initial = (lev.home_initial >= 2); - /* first fill the complete playfield with the default border element */ for (y = 0; y < HEIGHT; y++) for (x = 0; x < WIDTH; x++) @@ -778,6 +879,8 @@ void convert_em_level(unsigned char *src) native_em_level.cave[ply1.x_initial][ply1.y_initial] = Zplayer; if (ply2.alive_initial) native_em_level.cave[ply2.x_initial][ply2.y_initial] = Zplayer; + + native_em_level.file_version = file_version; } void prepare_em_level(void) @@ -798,7 +901,13 @@ void prepare_em_level(void) for (x = 0; x < WIDTH; x++) Draw[y][x] = Cave[y][x]; +#if 1 + lev.time_initial = lev.time_seconds; +#else + lev.time_initial = (lev.time_seconds * 50 + 7) / 8; +#endif lev.time = lev.time_initial; + lev.required = lev.required_initial; lev.score = 0; @@ -827,6 +936,8 @@ void prepare_em_level(void) lev.home = lev.home_initial; + lev.killed_out_of_time = FALSE; + ply1.num = 0; ply1.alive = ply1.alive_initial; ply1.dynamite = 0; @@ -835,7 +946,9 @@ void prepare_em_level(void) ply1.anim = 0; ply1.oldx = ply1.x = ply1.x_initial; ply1.oldy = ply1.y = ply1.y_initial; - ply1.joy_n = ply1.joy_e = ply1.joy_s = ply1.joy_w = ply1.joy_fire = 0; + ply1.last_move_dir = MV_NO_MOVING; + ply1.joy_n = ply1.joy_e = ply1.joy_s = ply1.joy_w = 0; + ply1.joy_snap = ply1.joy_drop = 0; ply1.joy_stick = ply1.joy_spin = 0; ply2.num = 1; @@ -846,6 +959,8 @@ void prepare_em_level(void) ply2.anim = 0; ply2.oldx = ply2.x = ply2.x_initial; ply2.oldy = ply2.y = ply2.y_initial; - ply2.joy_n = ply2.joy_e = ply2.joy_s = ply2.joy_w = ply2.joy_fire = 0; + ply2.last_move_dir = MV_NO_MOVING; + ply2.joy_n = ply2.joy_e = ply2.joy_s = ply2.joy_w = 0; + ply2.joy_snap = ply1.joy_drop = 0; ply2.joy_stick = ply2.joy_spin = 0; }