projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed warnings and debug output to use new generic logging functions
[rocksndiamonds.git]
/
src
/
game_em
/
convert.c
diff --git
a/src/game_em/convert.c
b/src/game_em/convert.c
index 6b09ece6a7b26ec5a06e9e4975dbdf32d6b1a490..9219e19774ee95b5ddbaeaa20ba28c11aebf64a3 100644
(file)
--- a/
src/game_em/convert.c
+++ b/
src/game_em/convert.c
@@
-53,6
+53,8
@@
static const short map[CAVE_TILE_MAX] =
[Cbomb] = Xbomb,
[Cnut] = Xnut,
[Cspring] = Xspring,
[Cbomb] = Xbomb,
[Cnut] = Xnut,
[Cspring] = Xspring,
+ [Cspring_e] = Xspring_e,
+ [Cspring_w] = Xspring_w,
[Cpush_emerald_e] = Xpush_emerald_e,
[Cpush_emerald_w] = Xpush_emerald_w,
[Cpush_diamond_e] = Xpush_diamond_e,
[Cpush_emerald_e] = Xpush_emerald_e,
[Cpush_emerald_w] = Xpush_emerald_w,
[Cpush_diamond_e] = Xpush_diamond_e,
@@
-215,7
+217,7
@@
int map_em_element_C_to_X(int element_em_cave)
{
if (element_em_cave < 0 || element_em_cave >= CAVE_TILE_MAX)
{
{
if (element_em_cave < 0 || element_em_cave >= CAVE_TILE_MAX)
{
-
Error(ERR_WARN,
"invalid EM cave element %d", element_em_cave);
+
Warn(
"invalid EM cave element %d", element_em_cave);
return Xblank;
}
return Xblank;
}
@@
-244,7
+246,7
@@
int map_em_element_X_to_C(int element_em_game)
if (element_em_game < 0 || element_em_game >= GAME_TILE_MAX)
{
if (element_em_game < 0 || element_em_game >= GAME_TILE_MAX)
{
-
Error(ERR_WARN,
"invalid EM game element %d", element_em_game);
+
Warn(
"invalid EM game element %d", element_em_game);
return Cblank;
}
return Cblank;
}
@@
-252,7
+254,7
@@
int map_em_element_X_to_C(int element_em_game)
int element_em_cave = map_reverse[element_em_game];
if (element_em_cave == Cblank && element_em_game != Xblank)
int element_em_cave = map_reverse[element_em_game];
if (element_em_cave == Cblank && element_em_game != Xblank)
-
Error(ERR_WARN,
"unknown EM game element %d", element_em_game);
+
Warn(
"unknown EM game element %d", element_em_game);
return element_em_cave;
}
return element_em_cave;
}
@@
-351,8
+353,8
@@
void prepare_em_level(void)
lev.wheel_time = cav.wheel_time;
lev.wheel_cnt = cav.wheel_active ? cav.wheel_time : 0;
lev.wheel_time = cav.wheel_time;
lev.wheel_cnt = cav.wheel_active ? cav.wheel_time : 0;
- lev.wheel_x = cav.wheel_x;
- lev.wheel_y = cav.wheel_y;
+ lev.wheel_x = cav.wheel_x
+ lev.left
;
+ lev.wheel_y = cav.wheel_y
+ lev.top
;
lev.wind_time = cav.wind_time;
lev.wind_cnt = cav.wind_time;
lev.wind_time = cav.wind_time;
lev.wind_cnt = cav.wind_time;
@@
-363,7
+365,8
@@
void prepare_em_level(void)
lev.killed_out_of_time = FALSE;
lev.killed_out_of_time = FALSE;
- lev.num_ball_arrays = cav.num_ball_arrays;
+ lev.num_eater_arrays = cav.num_eater_arrays;
+ lev.num_ball_arrays = cav.num_ball_arrays;
for (i = 0; i < 8; i++)
for (j = 0; j < 9; j++)
for (i = 0; i < 8; i++)
for (j = 0; j < 9; j++)
@@
-458,7
+461,12
@@
void prepare_em_level(void)
//
// - game_em.use_single_button (default: TRUE)
// - game_em.use_snap_key_bug (default: FALSE)
//
// - game_em.use_single_button (default: TRUE)
// - game_em.use_snap_key_bug (default: FALSE)
+ // - game_em.use_random_bug (default: FALSE)
// - game_em.use_old_explosions (default: FALSE)
// - game_em.use_old_explosions (default: FALSE)
+ // - game_em.use_old_android (default: FALSE)
+ // - game_em.use_old_push_elements (default: FALSE)
+ // - game_em.use_old_push_into_acid (default: FALSE)
+ // - game_em.use_wrap_around (default: TRUE)
game_em.level_solved = FALSE;
game_em.game_over = FALSE;
game_em.level_solved = FALSE;
game_em.game_over = FALSE;