projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor code formatting changes
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 157564d824603e3cdac3a0cfbc8d1823735fb368..040a94481794c49ae1eff1418d2ffd22759d1c95 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-737,6
+737,16
@@
static struct LevelFileConfigInfo chunk_config_ELEM[] =
TYPE_BOOLEAN, CONF_VALUE_8_BIT(2),
&li.bd_magic_wall_stops_amoeba, TRUE
},
TYPE_BOOLEAN, CONF_VALUE_8_BIT(2),
&li.bd_magic_wall_stops_amoeba, TRUE
},
+ {
+ EL_BD_MAGIC_WALL, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(3),
+ &li.bd_magic_wall_zero_infinite, TRUE
+ },
+ {
+ EL_BD_MAGIC_WALL, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(4),
+ &li.bd_magic_wall_break_scan, FALSE
+ },
{
EL_BD_MAGIC_WALL, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
{
EL_BD_MAGIC_WALL, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
@@
-4264,8
+4274,10
@@
static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level)
cave->voodoo_disappear_in_explosion = level->bd_voodoo_vanish_by_explosion;
cave->level_penalty_time[0] = level->bd_voodoo_penalty_time;
cave->level_magic_wall_time[0] = level->time_magic_wall;
cave->voodoo_disappear_in_explosion = level->bd_voodoo_vanish_by_explosion;
cave->level_penalty_time[0] = level->bd_voodoo_penalty_time;
cave->level_magic_wall_time[0] = level->time_magic_wall;
+ cave->magic_timer_zero_is_infinite = level->bd_magic_wall_zero_infinite;
cave->magic_timer_wait_for_hatching = level->bd_magic_wall_wait_hatching;
cave->magic_wall_stops_amoeba = level->bd_magic_wall_stops_amoeba;
cave->magic_timer_wait_for_hatching = level->bd_magic_wall_wait_hatching;
cave->magic_wall_stops_amoeba = level->bd_magic_wall_stops_amoeba;
+ cave->magic_wall_breakscan = level->bd_magic_wall_break_scan;
cave->magic_diamond_to = LEVEL_TO_CAVE(level->bd_magic_wall_diamond_to);
cave->magic_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_rock_to);
cave->magic_diamond_to = LEVEL_TO_CAVE(level->bd_magic_wall_diamond_to);
cave->magic_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_rock_to);
@@
-4427,8
+4439,10
@@
static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
level->bd_voodoo_vanish_by_explosion = cave->voodoo_disappear_in_explosion;
level->bd_voodoo_penalty_time = cave->level_penalty_time[bd_level_nr];
level->time_magic_wall = cave->level_magic_wall_time[bd_level_nr];
level->bd_voodoo_vanish_by_explosion = cave->voodoo_disappear_in_explosion;
level->bd_voodoo_penalty_time = cave->level_penalty_time[bd_level_nr];
level->time_magic_wall = cave->level_magic_wall_time[bd_level_nr];
+ level->bd_magic_wall_zero_infinite = cave->magic_timer_zero_is_infinite;
level->bd_magic_wall_wait_hatching = cave->magic_timer_wait_for_hatching;
level->bd_magic_wall_stops_amoeba = cave->magic_wall_stops_amoeba;
level->bd_magic_wall_wait_hatching = cave->magic_timer_wait_for_hatching;
level->bd_magic_wall_stops_amoeba = cave->magic_wall_stops_amoeba;
+ level->bd_magic_wall_break_scan = cave->magic_wall_breakscan;
level->bd_magic_wall_diamond_to = CAVE_TO_LEVEL(cave->magic_diamond_to);
level->bd_magic_wall_rock_to = CAVE_TO_LEVEL(cave->magic_stone_to);
level->bd_magic_wall_diamond_to = CAVE_TO_LEVEL(cave->magic_diamond_to);
level->bd_magic_wall_rock_to = CAVE_TO_LEVEL(cave->magic_stone_to);
@@
-4607,6
+4621,9
@@
static void CopyNativeTape_BD_to_RND(struct LevelInfo *level)
}
TapeHaltRecording();
}
TapeHaltRecording();
+
+ if (!replay->success)
+ Warn("BD replay is marked as not successful");
}
}