#define INIT_GFX_RANDOM() (SimpleRND(1000000))
+#define GET_NEW_PUSH_DELAY(e) ( (element_info[e].push_delay_fixed) + \
+ RND(element_info[e].push_delay_random))
+#define GET_NEW_MOVE_DELAY(e) ( (element_info[e].move_delay_fixed) + \
+ RND(element_info[e].move_delay_random))
+
/* game button identifiers */
#define GAME_CTRL_ID_STOP 0
#define GAME_CTRL_ID_PAUSE 1
static void InitField(int x, int y, boolean init_game)
{
- switch (Feld[x][y])
+ int element = Feld[x][y];
+
+ switch (element)
{
case EL_SP_MURPHY:
if (init_game)
break;
default:
+ if (IS_CUSTOM_ELEMENT(element) && CAN_MOVE(element))
+ InitMovDir(x, y);
break;
}
}
game.initial_move_delay_value =
(level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED);
-#if 0
- /* dynamically adjust element properties according to game engine version */
- {
- static int ep_em_slippery_wall[] =
- {
- EL_STEELWALL,
- EL_WALL,
- EL_EXPANDABLE_WALL,
- EL_EXPANDABLE_WALL_HORIZONTAL,
- EL_EXPANDABLE_WALL_VERTICAL,
- EL_EXPANDABLE_WALL_ANY
- };
- static int ep_em_slippery_wall_num = SIZEOF_ARRAY_INT(ep_em_slippery_wall);
-
- /* special EM style gems behaviour */
- for (i=0; i<ep_em_slippery_wall_num; i++)
- SET_PROPERTY(ep_em_slippery_wall[i], EP_EM_SLIPPERY_WALL,
- level.em_slippery_gems);
-
- /* "EL_EXPANDABLE_WALL_GROWING" wasn't slippery for EM gems in 2.0.1 */
- SET_PROPERTY(EL_EXPANDABLE_WALL_GROWING, EP_EM_SLIPPERY_WALL,
- (level.em_slippery_gems &&
- game.engine_version > VERSION_IDENT(2,0,1)));
- }
-#endif
-
/* initialize changing elements information */
for (i=0; i<MAX_NUM_ELEMENTS; i++)
{
/* add changing elements from custom element configuration */
for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
{
- struct CustomElementChangeInfo *change = &level.custom_element[i].change;
int element = EL_CUSTOM_START + i;
+ struct ElementChangeInfo *change = &element_info[element].change;
/* only add custom elements that change after fixed/random frame delay */
- if (!IS_CHANGEABLE(element) ||
- (!HAS_CHANGE_EVENT(element, CE_DELAY_FIXED) &&
- !HAS_CHANGE_EVENT(element, CE_DELAY_RANDOM)))
+ if (!IS_CHANGEABLE(element) || !HAS_CHANGE_EVENT(element, CE_DELAY))
continue;
changing_element[element].base_element = element;
changing_element[element].next_element = change->successor;
- changing_element[element].change_delay = 0;
-
- if (HAS_CHANGE_EVENT(element, CE_DELAY_FIXED))
- changing_element[element].change_delay +=
- change->delay_fixed * change->delay_frames;
-
- if (HAS_CHANGE_EVENT(element, CE_DELAY_RANDOM));
- /* random frame delay added at runtime for each element individually */
+ changing_element[element].change_delay = (change->delay_fixed *
+ change->delay_frames);
}
}
AllPlayersGone = FALSE;
- game.yam_content_nr = 0;
+ game.yamyam_content_nr = 0;
game.magic_wall_active = FALSE;
game.magic_wall_time_left = 0;
game.light_time_left = 0;
break;
default:
- MovDir[x][y] = 1 << RND(4);
- if (element != EL_BUG &&
- element != EL_SPACESHIP &&
- element != EL_BD_BUTTERFLY &&
- element != EL_BD_FIREFLY)
- break;
-
- for (i=0; i<4; i++)
+ if (IS_CUSTOM_ELEMENT(element))
{
- int x1 = x + xy[i][0];
- int y1 = y + xy[i][1];
-
- if (!IN_LEV_FIELD(x1, y1) || !IS_FREE(x1, y1))
+ if (element_info[element].move_pattern == MV_ALL_DIRECTIONS)
+ MovDir[x][y] = 1 << RND(4);
+ else if (element_info[element].move_pattern == MV_HORIZONTAL)
+ MovDir[x][y] = (RND(2) ? MV_LEFT : MV_RIGHT);
+ else if (element_info[element].move_pattern == MV_VERTICAL)
+ MovDir[x][y] = (RND(2) ? MV_UP : MV_DOWN);
+ else if (element_info[element].move_pattern & MV_ANY_DIRECTION)
+ MovDir[x][y] = element_info[element].move_pattern;
+ else if (element_info[element].move_pattern == MV_ALONG_LEFT_SIDE ||
+ element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE)
{
- if (element == EL_BUG || element == EL_BD_BUTTERFLY)
+ for (i=0; i<4; i++)
{
- MovDir[x][y] = direction[0][i];
- break;
+ int x1 = x + xy[i][0];
+ int y1 = y + xy[i][1];
+
+ if (!IN_LEV_FIELD(x1, y1) || !IS_FREE(x1, y1))
+ {
+ if (element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE)
+ MovDir[x][y] = direction[0][i];
+ else
+ MovDir[x][y] = direction[1][i];
+
+ break;
+ }
}
- else if (element == EL_SPACESHIP || element == EL_BD_FIREFLY ||
- element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
+ }
+ }
+ else
+ {
+ MovDir[x][y] = 1 << RND(4);
+
+ if (element != EL_BUG &&
+ element != EL_SPACESHIP &&
+ element != EL_BD_BUTTERFLY &&
+ element != EL_BD_FIREFLY)
+ break;
+
+ for (i=0; i<4; i++)
+ {
+ int x1 = x + xy[i][0];
+ int y1 = y + xy[i][1];
+
+ if (!IN_LEV_FIELD(x1, y1) || !IS_FREE(x1, y1))
{
- MovDir[x][y] = direction[1][i];
- break;
+ if (element == EL_BUG || element == EL_BD_BUTTERFLY)
+ {
+ MovDir[x][y] = direction[0][i];
+ break;
+ }
+ else if (element == EL_SPACESHIP || element == EL_BD_FIREFLY ||
+ element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
+ {
+ MovDir[x][y] = direction[1][i];
+ break;
+ }
}
}
}
Feld[ex][ey] = center_element;
}
- for (y=ey-1; y<=ey+1; y++) for(x=ex-1; x<=ex+1; x++)
+ for (y = ey - 1; y <= ey + 1; y++) for(x = ex - 1; x <= ex + 1; x++)
{
int element;
Store[x][y] = EL_BD_DIAMOND;
else if (center_element == EL_SP_ELECTRON)
Store[x][y] = EL_SP_INFOTRON;
- else if (center_element == EL_YAMYAM)
- Store[x][y] = level.yam_content[game.yam_content_nr][x-ex+1][y-ey+1];
else if (center_element == EL_AMOEBA_TO_DIAMOND)
Store[x][y] = level.amoeba_content;
+ else if (center_element == EL_YAMYAM)
+ Store[x][y] =
+ level.yamyam_content[game.yamyam_content_nr][x - ex + 1][y - ey + 1];
+ else if (IS_CUSTOM_ELEMENT(center_element))
+ Store[x][y] =
+ element_info[center_element].content[x - ex + 1][y - ey + 1];
else if (element == EL_WALL_EMERALD)
Store[x][y] = EL_EMERALD;
else if (element == EL_WALL_DIAMOND)
}
if (center_element == EL_YAMYAM)
- game.yam_content_nr = (game.yam_content_nr + 1) % level.num_yam_contents;
+ game.yamyam_content_nr =
+ (game.yamyam_content_nr + 1) % level.num_yamyam_contents;
return;
}
if (IS_PLAYER(x, y))
KillHeroUnlessProtected(x, y);
- else if (IS_CAN_EXPLODE(element))
+ else if (CAN_EXPLODE(element))
{
Feld[x][y] = Store2[x][y];
Store2[x][y] = 0;
for (i=0; i<4; i++)
{
- int ex = x + xy[i%4][0];
- int ey = y + xy[i%4][1];
+ int ex = x + xy[i % 4][0];
+ int ey = y + xy[i % 4][1];
if (IN_LEV_FIELD(ex, ey) && Feld[ex][ey] == EL_EXIT_OPEN)
{
}
MovDir[x][y] = MV_NO_MOVING;
- if (attr_x<x)
+ if (attr_x < x)
MovDir[x][y] |= (AllPlayersGone ? MV_RIGHT : MV_LEFT);
- else if (attr_x>x)
+ else if (attr_x > x)
MovDir[x][y] |= (AllPlayersGone ? MV_LEFT : MV_RIGHT);
- if (attr_y<y)
+ if (attr_y < y)
MovDir[x][y] |= (AllPlayersGone ? MV_DOWN : MV_UP);
- else if (attr_y>y)
+ else if (attr_y > y)
MovDir[x][y] |= (AllPlayersGone ? MV_UP : MV_DOWN);
if (element == EL_ROBOT)
{
int newx, newy;
- if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
- MovDir[x][y] &= (RND(2) ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+ if (MovDir[x][y] & MV_HORIZONTAL && MovDir[x][y] & MV_VERTICAL)
+ MovDir[x][y] &= (RND(2) ? MV_HORIZONTAL : MV_VERTICAL);
Moving2Blocked(x, y, &newx, &newy);
if (IN_LEV_FIELD(newx, newy) && IS_FREE_OR_PLAYER(newx, newy))
MovDelay[x][y] = 1;
- if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
+ if (MovDir[x][y] & MV_HORIZONTAL && MovDir[x][y] & MV_VERTICAL)
{
boolean first_horiz = RND(2);
int new_move_dir = MovDir[x][y];
MovDir[x][y] =
- new_move_dir & (first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+ new_move_dir & (first_horiz ? MV_HORIZONTAL : MV_VERTICAL);
Moving2Blocked(x, y, &newx, &newy);
if (IN_LEV_FIELD(newx, newy) &&
return;
MovDir[x][y] =
- new_move_dir & (!first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+ new_move_dir & (!first_horiz ? MV_HORIZONTAL : MV_VERTICAL);
Moving2Blocked(x, y, &newx, &newy);
if (IN_LEV_FIELD(newx, newy) &&
}
}
}
+ else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS)
+ {
+ boolean can_turn_left = FALSE, can_turn_right = FALSE;
+
+ if (IN_LEV_FIELD(left_x, left_y) && IS_FREE(left_x, left_y))
+ can_turn_left = TRUE;
+ if (IN_LEV_FIELD(right_x, right_y) && IS_FREE(right_x, right_y))
+ can_turn_right = TRUE;
+
+ if (can_turn_left && can_turn_right)
+ MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
+ else if (can_turn_left)
+ MovDir[x][y] = (RND(2) ? left_dir : back_dir);
+ else if (can_turn_right)
+ MovDir[x][y] = (RND(2) ? right_dir : back_dir);
+ else
+ MovDir[x][y] = back_dir;
+
+ MovDelay[x][y] = GET_NEW_MOVE_DELAY(element);
+ }
+ else if (element_info[element].move_pattern == MV_HORIZONTAL ||
+ element_info[element].move_pattern == MV_VERTICAL)
+ {
+ MovDir[x][y] = back_dir;
+ MovDelay[x][y] = GET_NEW_MOVE_DELAY(element);
+ }
+ else if (element_info[element].move_pattern & MV_ANY_DIRECTION)
+ {
+ MovDir[x][y] = element_info[element].move_pattern;
+ MovDelay[x][y] = GET_NEW_MOVE_DELAY(element);
+ }
+ else if (element_info[element].move_pattern == MV_ALONG_LEFT_SIDE)
+ {
+ if (IN_LEV_FIELD(left_x, left_y) && IS_FREE(left_x, left_y))
+ MovDir[x][y] = left_dir;
+ else if (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y))
+ MovDir[x][y] = right_dir;
+
+ MovDelay[x][y] = GET_NEW_MOVE_DELAY(element);
+ }
+ else if (element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE)
+ {
+ if (IN_LEV_FIELD(right_x, right_y) && IS_FREE(right_x, right_y))
+ MovDir[x][y] = right_dir;
+ else if (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y))
+ MovDir[x][y] = left_dir;
+
+ MovDelay[x][y] = GET_NEW_MOVE_DELAY(element);
+ }
+ else if (element_info[element].move_pattern == MV_TOWARDS_PLAYER ||
+ element_info[element].move_pattern == MV_AWAY_FROM_PLAYER)
+ {
+ int attr_x = -1, attr_y = -1;
+ int newx, newy;
+ boolean move_away =
+ (element_info[element].move_pattern == MV_AWAY_FROM_PLAYER);
+
+ if (AllPlayersGone)
+ {
+ attr_x = ExitX;
+ attr_y = ExitY;
+ }
+ else
+ {
+ int i;
+
+ for (i=0; i<MAX_PLAYERS; i++)
+ {
+ struct PlayerInfo *player = &stored_player[i];
+ int jx = player->jx, jy = player->jy;
+
+ if (!player->active)
+ continue;
+
+ if (attr_x == -1 || ABS(jx-x)+ABS(jy-y) < ABS(attr_x-x)+ABS(attr_y-y))
+ {
+ attr_x = jx;
+ attr_y = jy;
+ }
+ }
+ }
+
+ MovDir[x][y] = MV_NO_MOVING;
+ if (attr_x < x)
+ MovDir[x][y] |= (move_away ? MV_RIGHT : MV_LEFT);
+ else if (attr_x > x)
+ MovDir[x][y] |= (move_away ? MV_LEFT : MV_RIGHT);
+ if (attr_y < y)
+ MovDir[x][y] |= (move_away ? MV_DOWN : MV_UP);
+ else if (attr_y > y)
+ MovDir[x][y] |= (move_away ? MV_UP : MV_DOWN);
+
+ MovDelay[x][y] = GET_NEW_MOVE_DELAY(element);
+
+ if (MovDir[x][y] & MV_HORIZONTAL && MovDir[x][y] & MV_VERTICAL)
+ {
+ boolean first_horiz = RND(2);
+ int new_move_dir = MovDir[x][y];
+
+ MovDir[x][y] =
+ new_move_dir & (first_horiz ? MV_HORIZONTAL : MV_VERTICAL);
+ Moving2Blocked(x, y, &newx, &newy);
+
+ if (IN_LEV_FIELD(newx, newy) && (IS_FREE(newx, newy) ||
+ Feld[newx][newy] == EL_ACID))
+ return;
+
+ MovDir[x][y] =
+ new_move_dir & (!first_horiz ? MV_HORIZONTAL : MV_VERTICAL);
+ Moving2Blocked(x, y, &newx, &newy);
+
+ if (IN_LEV_FIELD(newx, newy) && (IS_FREE(newx, newy) ||
+ Feld[newx][newy] == EL_ACID))
+ return;
+
+ MovDir[x][y] = old_move_dir;
+ }
+ }
}
static boolean JustBeingPushed(int x, int y)
if (element != EL_YAMYAM &&
element != EL_DARK_YAMYAM &&
- element != EL_PACMAN)
+ element != EL_PACMAN &&
+ !(element_info[element].move_pattern & MV_ANY_DIRECTION))
{
TurnRound(x, y);
{
int flamed = MovingOrBlocked2Element(xx, yy);
- if (IS_ENEMY(flamed) || IS_CAN_EXPLODE(flamed))
+ if (IS_ENEMY(flamed) || CAN_EXPLODE(flamed))
Bang(xx, yy);
else
RemoveMovingField(xx, yy);
{
MovDelay[x][y] = changing_element[element].change_delay + 1;
- if (IS_CUSTOM_ELEMENT(element) &&
- HAS_CHANGE_EVENT(element, CE_DELAY_RANDOM))
+ if (IS_CUSTOM_ELEMENT(element) && HAS_CHANGE_EVENT(element, CE_DELAY))
{
- int i = element - EL_CUSTOM_START;
- int max_random_delay = level.custom_element[i].change.delay_random;
- int delay_frames = level.custom_element[i].change.delay_frames;
+ int max_random_delay = element_info[element].change.delay_random;
+ int delay_frames = element_info[element].change.delay_frames;
MovDelay[x][y] += RND(max_random_delay * delay_frames);
}
player->is_collecting = FALSE;
}
- if (player->MovPos == 0)
+ if (player->MovPos == 0) /* last pushing move finished */
player->Pushing = FALSE;
- if (mode == DF_NO_PUSH)
+ if (mode == DF_NO_PUSH) /* player just stopped pushing */
{
player->Switching = FALSE;
player->push_delay = 0;
#if 1
if (mode != DF_SNAP)
{
- GfxElement[x][y] = element;
+ GfxElement[x][y] =
+ (CAN_BE_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element));
player->is_digging = TRUE;
}
#endif
if (CAN_FALL(element) && dy)
return MF_NO_ACTION;
+ if (!player->Pushing &&
+ game.engine_version >= RELEASE_IDENT(2,2,0,7))
+ player->push_delay_value = GET_NEW_PUSH_DELAY(element);
+
player->Pushing = TRUE;
- if (!IN_LEV_FIELD(x+dx, y+dy) || !IS_FREE(x+dx, y+dy))
+ if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
return MF_NO_ACTION;
if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
return MF_NO_ACTION;
- if (player->push_delay == 0)
+ if (player->push_delay == 0) /* new pushing; restart delay */
player->push_delay = FrameCounter;
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
RemoveField(x, y);
Feld[x + dx][y + dy] = element;
+#if 1
+ if (game.engine_version < RELEASE_IDENT(2,2,0,7))
+ player->push_delay_value = GET_NEW_PUSH_DELAY(element);
+#else
player->push_delay_value = 2 + RND(8);
+#endif
DrawLevelField(x + dx, y + dy);
PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
case EL_EMERALD_YELLOW:
case EL_EMERALD_RED:
case EL_EMERALD_PURPLE:
+ case EL_SP_INFOTRON:
RaiseScore(level.score[SC_EMERALD]);
break;
case EL_DIAMOND:
RaiseScore(level.score[SC_DIAMOND]);
break;
+ case EL_CRYSTAL:
+ RaiseScore(level.score[SC_CRYSTAL]);
+ break;
+ case EL_PEARL:
+ RaiseScore(level.score[SC_PEARL]);
+ break;
case EL_BUG:
case EL_BD_BUTTERFLY:
+ case EL_SP_ELECTRON:
RaiseScore(level.score[SC_BUG]);
break;
case EL_SPACESHIP:
case EL_BD_FIREFLY:
+ case EL_SP_SNIKSNAK:
RaiseScore(level.score[SC_SPACESHIP]);
break;
case EL_YAMYAM:
RaiseScore(level.score[SC_NUT]);
break;
case EL_DYNAMITE:
+ case EL_DYNABOMB_INCREASE_NUMBER:
+ case EL_DYNABOMB_INCREASE_SIZE:
+ case EL_DYNABOMB_INCREASE_POWER:
RaiseScore(level.score[SC_DYNAMITE]);
break;
+ case EL_SHIELD_NORMAL:
+ case EL_SHIELD_DEADLY:
+ RaiseScore(level.score[SC_SHIELD]);
+ break;
+ case EL_EXTRA_TIME:
+ RaiseScore(level.score[SC_TIME_BONUS]);
+ break;
case EL_KEY_1:
case EL_KEY_2:
case EL_KEY_3:
projects / rocksndiamonds.git / blobdiff