X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Freademc.c;h=dfa293a6ebe1eeee4d905142e7af8a0618bb9db0;hb=d781e40cf5aade94d6f4e80b98b0bf04cc880766;hp=5184d8d72ed9bb217d57d00e2e622ed1049fe50c;hpb=9e3b9d32e82663858c54a3884a2bb7680d458218;p=rocksndiamonds.git diff --git a/src/game_em/reademc.c b/src/game_em/reademc.c index 5184d8d7..dfa293a6 100644 --- a/src/game_em/reademc.c +++ b/src/game_em/reademc.c @@ -299,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.infinite = game_em.use_wrap_around; - cav.testmode = FALSE; cav.teamwork = (src[2150] & 128) != 0; /* scores */ @@ -314,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.exit_score = src[2093] * 8 / 5; + cav.exit_score = src[2093]; cav.lenses_score = src[2151]; cav.magnify_score = src[2152]; @@ -693,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) - 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; } @@ -787,8 +784,7 @@ int cleanup_em_level(unsigned char *src, int length, char *filename) /* 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; }