lev.killed_out_of_time = FALSE;
- if (lev.android_eater)
- {
- lev.android_array[Xeater_n] = Xeater_n;
- lev.android_array[Yeater_nB] = Xeater_n;
-
- lev.android_array[Xeater_e] = Xeater_e;
- lev.android_array[Yeater_eB] = Xeater_e;
-
- lev.android_array[Xeater_s] = Xeater_s;
- lev.android_array[Yeater_sB] = Xeater_s;
-
- lev.android_array[Xeater_w] = Xeater_w;
- lev.android_array[Yeater_wB] = Xeater_w;
- }
-
- if (lev.android_alien)
- {
- lev.android_array[Xalien] = Xalien;
- lev.android_array[Xalien_pause] = Xalien;
- lev.android_array[Yalien_nB] = Xalien;
- lev.android_array[Yalien_eB] = Xalien;
- lev.android_array[Yalien_sB] = Xalien;
- lev.android_array[Yalien_wB] = Xalien;
- }
-
- if (lev.android_bug)
- {
- lev.android_array[Xbug_1_n] = Xbug_2_n;
- lev.android_array[Xbug_2_n] = Xbug_2_n;
- lev.android_array[Ybug_nB] = Xbug_2_n;
- lev.android_array[Ybug_n_e] = Xbug_2_n;
- lev.android_array[Ybug_n_w] = Xbug_2_n;
-
- lev.android_array[Xbug_1_e] = Xbug_2_e;
- lev.android_array[Xbug_2_e] = Xbug_2_e;
- lev.android_array[Ybug_eB] = Xbug_2_e;
- lev.android_array[Ybug_e_s] = Xbug_2_e;
- lev.android_array[Ybug_e_n] = Xbug_2_e;
-
- lev.android_array[Xbug_1_s] = Xbug_2_s;
- lev.android_array[Xbug_2_s] = Xbug_2_s;
- lev.android_array[Ybug_sB] = Xbug_2_s;
- lev.android_array[Ybug_s_w] = Xbug_2_s;
- lev.android_array[Ybug_s_e] = Xbug_2_s;
-
- lev.android_array[Xbug_1_w] = Xbug_2_w;
- lev.android_array[Xbug_2_w] = Xbug_2_w;
- lev.android_array[Ybug_wB] = Xbug_2_w;
- lev.android_array[Ybug_w_n] = Xbug_2_w;
- lev.android_array[Ybug_w_s] = Xbug_2_w;
- }
-
- if (lev.android_tank)
- {
- lev.android_array[Xtank_1_n] = Xtank_1_n;
- lev.android_array[Xtank_2_n] = Xtank_1_n;
- lev.android_array[Ytank_nB] = Xtank_1_n;
- lev.android_array[Ytank_n_e] = Xtank_1_n;
- lev.android_array[Ytank_n_w] = Xtank_1_n;
-
- lev.android_array[Xtank_1_e] = Xtank_1_e;
- lev.android_array[Xtank_2_e] = Xtank_1_e;
- lev.android_array[Ytank_eB] = Xtank_1_e;
- lev.android_array[Ytank_e_s] = Xtank_1_e;
- lev.android_array[Ytank_e_n] = Xtank_1_e;
-
- lev.android_array[Xtank_1_s] = Xtank_1_s;
- lev.android_array[Xtank_2_s] = Xtank_1_s;
- lev.android_array[Ytank_sB] = Xtank_1_s;
- lev.android_array[Ytank_s_w] = Xtank_1_s;
- lev.android_array[Ytank_s_e] = Xtank_1_s;
-
- lev.android_array[Xtank_1_w] = Xtank_1_w;
- lev.android_array[Xtank_2_w] = Xtank_1_w;
- lev.android_array[Ytank_wB] = Xtank_1_w;
- lev.android_array[Ytank_w_n] = Xtank_1_w;
- lev.android_array[Ytank_w_s] = Xtank_1_w;
- }
-
- if (lev.android_emerald)
- {
- lev.android_array[Xemerald] = Xemerald;
- lev.android_array[Xemerald_pause] = Xemerald;
- lev.android_array[Xemerald_fall] = Xemerald;
- lev.android_array[Yemerald_sB] = Xemerald;
- lev.android_array[Yemerald_eB] = Xemerald;
- lev.android_array[Yemerald_wB] = Xemerald;
- }
-
- if (lev.android_diamond)
- {
- lev.android_array[Xdiamond] = Xdiamond;
- lev.android_array[Xdiamond_pause] = Xdiamond;
- lev.android_array[Xdiamond_fall] = Xdiamond;
- lev.android_array[Ydiamond_sB] = Xdiamond;
- lev.android_array[Ydiamond_eB] = Xdiamond;
- lev.android_array[Ydiamond_wB] = Xdiamond;
- }
-
- if (lev.android_stone)
- {
- lev.android_array[Xstone] = Xstone;
- lev.android_array[Xstone_pause] = Xstone;
- lev.android_array[Xstone_fall] = Xstone;
- lev.android_array[Ystone_sB] = Xstone;
- lev.android_array[Ystone_eB] = Xstone;
- lev.android_array[Ystone_wB] = Xstone;
- }
-
- if (lev.android_bomb)
- {
- lev.android_array[Xbomb] = Xbomb;
- lev.android_array[Xbomb_pause] = Xbomb;
- lev.android_array[Xbomb_fall] = Xbomb;
- lev.android_array[Ybomb_sB] = Xbomb;
- lev.android_array[Ybomb_eB] = Xbomb;
- lev.android_array[Ybomb_wB] = Xbomb;
- }
-
- if (lev.android_nut)
- {
- lev.android_array[Xnut] = Xnut;
- lev.android_array[Xnut_pause] = Xnut;
- lev.android_array[Xnut_fall] = Xnut;
- lev.android_array[Ynut_sB] = Xnut;
- lev.android_array[Ynut_eB] = Xnut;
- lev.android_array[Ynut_wB] = Xnut;
- }
-
- if (lev.android_spring)
- {
- lev.android_array[Xspring] = Xspring;
- lev.android_array[Xspring_pause] = Xspring;
- lev.android_array[Xspring_fall] = Xspring;
- lev.android_array[Xspring_e] = Xspring;
- lev.android_array[Xspring_w] = Xspring;
- lev.android_array[Yspring_sB] = Xspring;
- lev.android_array[Yspring_eB] = Xspring;
- lev.android_array[Yspring_wB] = Xspring;
- lev.android_array[Yspring_alien_eB] = Xspring;
- lev.android_array[Yspring_alien_wB] = Xspring;
- }
-
- if (lev.android_dynamite)
- {
- lev.android_array[Xdynamite] = Xdynamite;
- }
-
- if (lev.android_balloon)
- {
- lev.android_array[Xballoon] = Xballoon;
- lev.android_array[Yballoon_nB] = Xballoon;
- lev.android_array[Yballoon_eB] = Xballoon;
- lev.android_array[Yballoon_sB] = Xballoon;
- lev.android_array[Yballoon_wB] = Xballoon;
- }
-
- if (lev.android_amoeba)
- {
- lev.android_array[Xfake_amoeba] = Xdrip;
- lev.android_array[Yfake_amoeba] = Xdrip;
- lev.android_array[Xamoeba_1] = Xdrip;
- lev.android_array[Xamoeba_2] = Xdrip;
- lev.android_array[Xamoeba_3] = Xdrip;
- lev.android_array[Xamoeba_4] = Xdrip;
- lev.android_array[Xamoeba_5] = Xdrip;
- lev.android_array[Xamoeba_6] = Xdrip;
- lev.android_array[Xamoeba_7] = Xdrip;
- lev.android_array[Xamoeba_8] = Xdrip;
- }
-
/* determine number of players in this level */
lev.home_initial = 0;
ply[i].exists = 0;
ply[i].alive_initial = FALSE;
- if (ply[i].x_initial != -1 && ply[i].y_initial != -1)
+ if (lev.player_x[i] != -1 &&
+ lev.player_y[i] != -1)
{
ply[i].exists = 1;
}
else
{
- int x = ply[i].x_initial;
- int y = ply[i].y_initial;
+ int x = lev.player_x[i];
+ int y = lev.player_y[i];
native_em_level.cave[x][y] = Xblank;
ply[i].dynamite_cnt = 0;
ply[i].keys = 0;
ply[i].anim = 0;
- ply[i].oldx = ply[i].x = ply[i].x_initial + lev.left;
- ply[i].oldy = ply[i].y = ply[i].y_initial + lev.top;
+ ply[i].oldx = ply[i].x = lev.player_x[i] + lev.left;
+ ply[i].oldy = ply[i].y = lev.player_y[i] + lev.top;
ply[i].last_move_dir = MV_NONE;
ply[i].joy_n = ply[i].joy_e = ply[i].joy_s = ply[i].joy_w = 0;
ply[i].joy_snap = ply[i].joy_drop = 0;
projects / rocksndiamonds.git / blobdiff