projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version number set to 4.3.4.1
[rocksndiamonds.git]
/
src
/
game_em
/
reademc.c
diff --git
a/src/game_em/reademc.c
b/src/game_em/reademc.c
index 1308615c363d7ceee40d581fa8c11036e933ca1d..dfa293a6ebe1eeee4d905142e7af8a0618bb9db0 100644
(file)
--- a/
src/game_em/reademc.c
+++ b/
src/game_em/reademc.c
@@
-40,6
+40,12
@@
* behaviour.
*/
* behaviour.
*/
+/* changes for game engine integration in Rocks'n'Diamonds:
+ *
+ * added support for rolling spring (not mapped to pushed spring)
+ * - required for Elvis Mine 8, levels 3, 23, 48 and 73
+ */
+
#define GET_BE16(x) ((&x)[0] << 8 | (&x)[1])
static const short map_emc_raw[256] =
#define GET_BE16(x) ((&x)[0] << 8 | (&x)[1])
static const short map_emc_raw[256] =
@@
-62,8
+68,8
@@
static const short map_emc_raw[256] =
Cdynamite_2, Cdynamite_3, Cdynamite_4, Cacid_s, // 60
Cexit_1, Cexit_2, Cexit_3, Cballoon, // 64
Cdynamite_2, Cdynamite_3, Cdynamite_4, Cacid_s, // 60
Cexit_1, Cexit_2, Cexit_3, Cballoon, // 64
- Cplant, Cspring, Cspring, C
push_spring_w,
// 68
- C
push_spring_e,
Cball_1, Cball_2, Candroid, // 72
+ Cplant, Cspring, Cspring, C
spring_w,
// 68
+ C
spring_e,
Cball_1, Cball_2, Candroid, // 72
Cpause, Candroid, Candroid, Candroid, // 76
Candroid, Candroid, Candroid, Candroid, // 80
Candroid, Cblank, Cblank, Cblank, // 84
Cpause, Candroid, Candroid, Candroid, // 76
Candroid, Candroid, Candroid, Candroid, // 80
Candroid, Cblank, Cblank, Cblank, // 84
@@
-293,8
+299,6
@@
void convert_em_level(unsigned char *src, int file_version)
cav.time_seconds = MIN(GET_BE16(src[2110]), 9999);
cav.gems_needed = src[2095];
cav.time_seconds = MIN(GET_BE16(src[2110]), 9999);
cav.gems_needed = src[2095];
- cav.infinite = game_em.use_wrap_around;
- cav.testmode = FALSE;
cav.teamwork = (src[2150] & 128) != 0;
/* scores */
cav.teamwork = (src[2150] & 128) != 0;
/* scores */
@@
-308,7
+312,7
@@
void convert_em_level(unsigned char *src, int file_version)
cav.nut_score = src[2090];
cav.dynamite_score = src[2091];
cav.key_score = src[2092];
cav.nut_score = src[2090];
cav.dynamite_score = src[2091];
cav.key_score = src[2092];
- cav.exit_score = src[2093]
* 8 / 5
;
+ cav.exit_score = src[2093];
cav.lenses_score = src[2151];
cav.magnify_score = src[2152];
cav.lenses_score = src[2151];
cav.magnify_score = src[2152];
@@
-387,6
+391,9
@@
void convert_em_level(unsigned char *src, int file_version)
for (x = 0; x < 9; x++)
cav.eater_array[i][x] = map_emc[src[eater_offset[i] + x]];
for (x = 0; x < 9; x++)
cav.eater_array[i][x] = map_emc[src[eater_offset[i] + x]];
+ if (file_version < FILE_VERSION_EM_V6)
+ cav.num_eater_arrays = 4;
+
/* ball */
temp = map_emc[src[2159]];
/* ball */
temp = map_emc[src[2159]];
@@
-549,12
+556,12
@@
static const unsigned char map_v4[256] =
240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153 // 240
};
240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153 // 240
};
-static const unsigned char map_v4_eater[
32
] =
+static const unsigned char map_v4_eater[
28
] =
{
/* filter for v4 eater */
128,18,2,0, 4,8,16,20, 28,37,41,45, 189,180,179,252, // 0
{
/* filter for v4 eater */
128,18,2,0, 4,8,16,20, 28,37,41,45, 189,180,179,252, // 0
- 133,134,135,136, 146,147,175,65, 66,64,2,18
, 128,128,128,128
// 16
+ 133,134,135,136, 146,147,175,65, 66,64,2,18
// 16
};
static boolean filename_has_v1_format(char *filename)
};
static boolean filename_has_v1_format(char *filename)
@@
-667,7
+674,7
@@
int cleanup_em_level(unsigned char *src, int length, char *filename)
for (i = 0; i < 2048; i++) /* cave */
src[i] = map_v4[src[i]];
for (i = 2048; i < 2084; i++) /* eaters */
for (i = 0; i < 2048; i++) /* cave */
src[i] = map_v4[src[i]];
for (i = 2048; i < 2084; i++) /* eaters */
- src[i] = map_v4_eater[src[i]
% 32
];
+ src[i] = map_v4_eater[src[i]
< 28 ? src[i] : 0
];
for (i = 2112; i < 2148; i++) /* eaters */
src[i] = src[i - 64];
for (i = 2112; i < 2148; i++) /* eaters */
src[i] = src[i - 64];
@@
-684,8
+691,7
@@
int cleanup_em_level(unsigned char *src, int length, char *filename)
/* if file has length of old-style level file, print (wrong) magic byte */
if (length < 2110)
/* if file has length of old-style level file, print (wrong) magic byte */
if (length < 2110)
- Error(ERR_WARN, "unknown magic byte 0x%02x at position 0x%04x",
- src[1983], 1983);
+ Warn("unknown magic byte 0x%02x at position 0x%04x", src[1983], 1983);
return FILE_VERSION_EM_UNKNOWN;
}
return FILE_VERSION_EM_UNKNOWN;
}
@@
-778,8
+784,7
@@
int cleanup_em_level(unsigned char *src, int length, char *filename)
/* size of v6 cave */
length = 2172;
/* size of v6 cave */
length = 2172;
- if (options.debug)
- Error(ERR_DEBUG, "EM level file version: %d", file_version);
+ Debug("level:native:EM", "EM level file version: %d", file_version);
return file_version;
}
return file_version;
}