return stored_player[player_nr].inventory_size;
}
-void InitGameControlValues(void)
+static void InitGameControlValues(void)
{
int i;
sizeof(struct GamePanelOrderInfo), compareGamePanelOrderInfo);
}
-void UpdatePlayfieldElementCount(void)
+static void UpdatePlayfieldElementCount(void)
{
boolean use_element_count = FALSE;
int i, j, x, y;
element_info[j].element_count;
}
-void UpdateGameControlValues(void)
+static void UpdateGameControlValues(void)
{
int i, k;
int time = (local_player->LevelSolved ?
}
}
-void DisplayGameControlValues(void)
+static void DisplayGameControlValues(void)
{
boolean redraw_panel = FALSE;
int i;
DisplayGameControlValues();
}
-void UpdateGameDoorValues(void)
+#if 0
+static void UpdateGameDoorValues(void)
{
UpdateGameControlValues();
}
+#endif
void DrawGameDoorValues(void)
{
level.time = 0;
}
-int get_num_special_action(int element, int action_first, int action_last)
+static int get_num_special_action(int element, int action_first,
+ int action_last)
{
int num_special_action = 0;
int i, j;
SCAN_PLAYFIELD(x, y)
{
- Feld[x][y] = level.field[x][y];
+ Feld[x][y] = Last[x][y] = level.field[x][y];
MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
ChangeDelay[x][y] = 0;
ChangePage[x][y] = -1;
Feld[ExitX][ExitY] =
(element == EL_EXIT_OPEN ? EL_EXIT_CLOSING :
- element == EL_EM_EXIT_OPEN ? EL_EM_EXIT_CLOSING :
- element == EL_SP_EXIT_OPEN ? EL_SP_EXIT_CLOSING:
+ element == EL_EM_EXIT_OPEN ? EL_EM_EXIT_CLOSING :
+ element == EL_SP_EXIT_OPEN ? EL_SP_EXIT_CLOSING:
element == EL_STEEL_EXIT_OPEN ? EL_STEEL_EXIT_CLOSING:
EL_EM_STEEL_EXIT_CLOSING);
void GameEnd(void)
{
+ /* used instead of "level_nr" (needed for network games) */
+ int last_level_nr = levelset.level_nr;
int hi_pos;
local_player->LevelSolved_GameEnd = TRUE;
}
}
- /* used instead of last "level_nr" (for network games) */
- hi_pos = NewHiScore(levelset.level_nr);
+ hi_pos = NewHiScore(last_level_nr);
if (hi_pos >= 0 && !setup.skip_scores_after_game)
{
SetGameStatus(GAME_MODE_SCORES);
- DrawHallOfFame(levelset.level_nr, hi_pos);
+ DrawHallOfFame(last_level_nr, hi_pos);
}
else if (setup.auto_play_next_level && setup.increment_levels &&
+ last_level_nr < leveldir_current->last_level &&
!network_playing)
{
StartGameActions(network.enabled, setup.autorecord, level.random_seed);
GfxRandom[x][y] = INIT_GFX_RANDOM();
}
-void InitMovingField(int x, int y, int direction)
+static void InitMovingField(int x, int y, int direction)
{
int element = Feld[x][y];
int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
*comes_from_y = oldy;
}
-int MovingOrBlocked2Element(int x, int y)
+static int MovingOrBlocked2Element(int x, int y)
{
int element = Feld[x][y];
GfxDir[x][y] = MV_NONE;
}
-void RemoveMovingField(int x, int y)
+static void RemoveMovingField(int x, int y)
{
int oldx = x, oldy = y, newx = x, newy = y;
int element = Feld[x][y];
DrawGraphic(sx, sy, graphic, frame);
}
-void CheckDynamite(int x, int y)
+static void CheckDynamite(int x, int y)
{
if (MovDelay[x][y] != 0) /* dynamite is still waiting to explode */
{
*sy = (sy1 + sy2) / 2;
}
-void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
- boolean center_screen, boolean quick_relocation)
+static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
+ boolean center_screen, boolean quick_relocation)
{
unsigned int frame_delay_value_old = GetVideoFrameDelay();
boolean ffwd_delay = (tape.playing && tape.fast_forward);
SetVideoFrameDelay(frame_delay_value_old);
}
-void RelocatePlayer(int jx, int jy, int el_player_raw)
+static void RelocatePlayer(int jx, int jy, int el_player_raw)
{
int el_player = GET_PLAYER_ELEMENT(el_player_raw);
int player_nr = GET_PLAYER_NR(el_player);
}
}
-void Explode(int ex, int ey, int phase, int mode)
+static void Explode(int ex, int ey, int phase, int mode)
{
int x, y;
int last_phase;
}
}
-void DynaExplode(int ex, int ey)
+static void DynaExplode(int ex, int ey)
{
int i, j;
int dynabomb_element = Feld[ex][ey];
CheckTriggeredElementChange(x, y, element, CE_EXPLOSION_OF_X);
}
-void SplashAcid(int x, int y)
+static void SplashAcid(int x, int y)
{
if (IN_LEV_FIELD(x - 1, y - 1) && IS_FREE(x - 1, y - 1) &&
(!IN_LEV_FIELD(x - 1, y - 2) ||
EL_DC_TIMEGATE_SWITCH_ACTIVE);
}
-void Impact(int x, int y)
+static void Impact(int x, int y)
{
boolean last_line = (y == lev_fieldy - 1);
boolean object_hit = FALSE;
return FALSE;
}
-void StartMoving(int x, int y)
+static void StartMoving(int x, int y)
{
boolean started_moving = FALSE; /* some elements can fall _and_ move */
int element = Feld[x][y];
return group_nr;
}
-void AmoebenVereinigen(int ax, int ay)
+static void AmoebenVereinigen(int ax, int ay)
{
int i, x, y, xx, yy;
int new_group_nr = AmoebaNr[ax][ay];
}
}
-void AmoebeUmwandelnBD(int ax, int ay, int new_element)
+static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
{
int x, y;
int group_nr = AmoebaNr[ax][ay];
SND_BD_AMOEBA_TURNING_TO_GEM));
}
-void AmoebeWaechst(int x, int y)
+static void AmoebeWaechst(int x, int y)
{
static unsigned int sound_delay = 0;
static unsigned int sound_delay_value = 0;
}
}
-void AmoebaDisappearing(int x, int y)
+static void AmoebaDisappearing(int x, int y)
{
static unsigned int sound_delay = 0;
static unsigned int sound_delay_value = 0;
}
}
-void AmoebeAbleger(int ax, int ay)
+static void AmoebeAbleger(int ax, int ay)
{
int i;
int element = Feld[ax][ay];
TEST_DrawLevelField(newax, neway);
}
-void Life(int ax, int ay)
+static void Life(int ax, int ay)
{
int x1, y1, x2, y2;
int life_time = 40;
for (y1 = -1; y1 < 2; y1++) for (x1 = -1; x1 < 2; x1++)
{
int xx = ax+x1, yy = ay+y1;
- int nachbarn = 0;
+ int old_element = Feld[xx][yy];
+ int num_neighbours = 0;
if (!IN_LEV_FIELD(xx, yy))
continue;
if (!IN_LEV_FIELD(x, y) || (x == xx && y == yy))
continue;
- if (((Feld[x][y] == element ||
- (element == EL_GAME_OF_LIFE && IS_PLAYER(x, y))) &&
- !Stop[x][y]) ||
- (IS_FREE(x, y) && Stop[x][y]))
- nachbarn++;
+ boolean is_player_cell = (element == EL_GAME_OF_LIFE && IS_PLAYER(x, y));
+ boolean is_neighbour = FALSE;
+
+ if (level.use_life_bugs)
+ is_neighbour =
+ (((Feld[x][y] == element || is_player_cell) && !Stop[x][y]) ||
+ (IS_FREE(x, y) && Stop[x][y]));
+ else
+ is_neighbour =
+ (Last[x][y] == element || is_player_cell);
+
+ if (is_neighbour)
+ num_neighbours++;
}
+ boolean is_free = FALSE;
+
+ if (level.use_life_bugs)
+ is_free = (IS_FREE(xx, yy));
+ else
+ is_free = (IS_FREE(xx, yy) && Last[xx][yy] == EL_EMPTY);
+
if (xx == ax && yy == ay) /* field in the middle */
{
- if (nachbarn < life_parameter[0] ||
- nachbarn > life_parameter[1])
+ if (num_neighbours < life_parameter[0] ||
+ num_neighbours > life_parameter[1])
{
Feld[xx][yy] = EL_EMPTY;
- if (!Stop[xx][yy])
+ if (Feld[xx][yy] != old_element)
TEST_DrawLevelField(xx, yy);
Stop[xx][yy] = TRUE;
changed = TRUE;
}
}
- else if (IS_FREE(xx, yy) || CAN_GROW_INTO(Feld[xx][yy]))
+ else if (is_free || CAN_GROW_INTO(Feld[xx][yy]))
{ /* free border field */
- if (nachbarn >= life_parameter[2] &&
- nachbarn <= life_parameter[3])
+ if (num_neighbours >= life_parameter[2] &&
+ num_neighbours <= life_parameter[3])
{
Feld[xx][yy] = element;
MovDelay[xx][yy] = (element == EL_GAME_OF_LIFE ? 0 : life_time-1);
- if (!Stop[xx][yy])
+ if (Feld[xx][yy] != old_element)
TEST_DrawLevelField(xx, yy);
Stop[xx][yy] = TRUE;
changed = TRUE;
game.ball_content_nr = (game.ball_content_nr + 1) % level.num_ball_contents;
}
-void CheckExit(int x, int y)
+static void CheckExit(int x, int y)
{
if (local_player->gems_still_needed > 0 ||
local_player->sokobanfields_still_needed > 0 ||
PlayLevelSoundNearest(x, y, SND_CLASS_EXIT_OPENING);
}
-void CheckExitEM(int x, int y)
+static void CheckExitEM(int x, int y)
{
if (local_player->gems_still_needed > 0 ||
local_player->sokobanfields_still_needed > 0 ||
PlayLevelSoundNearest(x, y, SND_CLASS_EM_EXIT_OPENING);
}
-void CheckExitSteel(int x, int y)
+static void CheckExitSteel(int x, int y)
{
if (local_player->gems_still_needed > 0 ||
local_player->sokobanfields_still_needed > 0 ||
PlayLevelSoundNearest(x, y, SND_CLASS_STEEL_EXIT_OPENING);
}
-void CheckExitSteelEM(int x, int y)
+static void CheckExitSteelEM(int x, int y)
{
if (local_player->gems_still_needed > 0 ||
local_player->sokobanfields_still_needed > 0 ||
PlayLevelSoundNearest(x, y, SND_CLASS_EM_STEEL_EXIT_OPENING);
}
-void CheckExitSP(int x, int y)
+static void CheckExitSP(int x, int y)
{
if (local_player->gems_still_needed > 0)
{
}
}
-void DrawTwinkleOnField(int x, int y)
+static void DrawTwinkleOnField(int x, int y)
{
if (!IN_SCR_FIELD(SCREENX(x), SCREENY(y)) || IS_MOVING(x, y))
return;
}
}
-void MauerWaechst(int x, int y)
+static void MauerWaechst(int x, int y)
{
int delay = 6;
}
}
-void MauerAbleger(int ax, int ay)
+static void MauerAbleger(int ax, int ay)
{
int element = Feld[ax][ay];
int graphic = el2img(element);
PlayLevelSoundAction(ax, ay, ACTION_GROWING);
}
-void MauerAblegerStahl(int ax, int ay)
+static void MauerAblegerStahl(int ax, int ay)
{
int element = Feld[ax][ay];
int graphic = el2img(element);
PlayLevelSoundAction(ax, ay, ACTION_GROWING);
}
-void CheckForDragon(int x, int y)
+static void CheckForDragon(int x, int y)
{
int i, j;
boolean dragon_found = FALSE;
tape_action[TAPE_ACTION_BUTTON] = mouse_action->button;
}
-static void CheckLevelTime(void)
+static void CheckLevelSolved(void)
{
- int i;
-
- /* !!! SAME CODE AS IN "GameActions()" -- FIX THIS !!! */
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
{
if (level.native_em_level->lev->home == 0) /* all players at home */
if (game_mm.game_over) /* game lost */
AllPlayersGone = TRUE;
}
+}
+
+static void CheckLevelTime(void)
+{
+ int i;
if (TimeFrames >= FRAMES_PER_SECOND)
{
InitGame();
}
-void GameActionsExt(void)
+static void GameActionsExt(void)
{
#if 0
static unsigned int game_frame_delay = 0;
if (game.restart_level)
StartGameActions(network.enabled, setup.autorecord, level.random_seed);
- /* !!! SAME CODE AS IN "CheckLevelTime()" -- FIX THIS !!! */
- if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
- {
- if (level.native_em_level->lev->home == 0) /* all players at home */
- {
- PlayerWins(local_player);
-
- AllPlayersGone = TRUE;
-
- level.native_em_level->lev->home = -1;
- }
-
- if (level.native_em_level->ply[0]->alive == 0 &&
- level.native_em_level->ply[1]->alive == 0 &&
- level.native_em_level->ply[2]->alive == 0 &&
- level.native_em_level->ply[3]->alive == 0) /* all dead */
- AllPlayersGone = TRUE;
- }
- else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
- {
- if (game_sp.LevelSolved &&
- !game_sp.GameOver) /* game won */
- {
- PlayerWins(local_player);
-
- game_sp.GameOver = TRUE;
-
- AllPlayersGone = TRUE;
- }
-
- if (game_sp.GameOver) /* game lost */
- AllPlayersGone = TRUE;
- }
- else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
- {
- if (game_mm.level_solved &&
- !game_mm.game_over) /* game won */
- {
- PlayerWins(local_player);
-
- game_mm.game_over = TRUE;
-
- AllPlayersGone = TRUE;
- }
-
- if (game_mm.game_over) /* game lost */
- AllPlayersGone = TRUE;
- }
+ CheckLevelSolved();
if (local_player->LevelSolved && !local_player->LevelSolved_GameEnd)
GameWon();
BlitScreenToBitmap(backbuffer);
+ CheckLevelSolved();
CheckLevelTime();
AdvanceFrameAndPlayerCounters(-1); /* advance counters for all players */
SCAN_PLAYFIELD(x, y)
{
+ Last[x][y] = Feld[x][y];
+
ChangeCount[x][y] = 0;
ChangeEvent[x][y] = -1;
if (local_player->players_still_needed > 0)
local_player->players_still_needed--;
+
+ /* also set if some players not yet gone, but not needed to solve level */
+ if (local_player->players_still_needed == 0)
+ AllPlayersGone = TRUE;
}
static void setFieldForSnapping(int x, int y, int element, int direction)
FreeSnapshotList();
}
-ListNode *SaveEngineSnapshotBuffers(void)
+static ListNode *SaveEngineSnapshotBuffers(void)
{
ListNode *buffers = NULL;
SaveEngineSnapshotToList();
}
-void LoadEngineSnapshotValues(void)
+static void LoadEngineSnapshotValues(void)
{
/* restore special values from snapshot structure */
LoadEngineSnapshotValues();
}
-void LoadEngineSnapshot_Undo(int steps)
+static void LoadEngineSnapshot_Undo(int steps)
{
LoadSnapshotFromList_Older(steps);
LoadEngineSnapshotValues();
}
-void LoadEngineSnapshot_Redo(int steps)
+static void LoadEngineSnapshot_Redo(int steps)
{
LoadSnapshotFromList_Newer(steps);
ModifyGadget(game_gadget[GAME_CTRL_ID_PAUSE2], GDI_CHECKED, FALSE, GDI_END);
}
-void MapGameButtonsExt(boolean on_tape)
+static void MapGameButtonsExt(boolean on_tape)
{
int i;
RedrawGameButtons();
}
-void UnmapGameButtonsExt(boolean on_tape)
+static void UnmapGameButtonsExt(boolean on_tape)
{
int i;
UnmapGadget(game_gadget[i]);
}
-void RedrawGameButtonsExt(boolean on_tape)
+static void RedrawGameButtonsExt(boolean on_tape)
{
int i;
redraw_mask &= ~REDRAW_ALL;
}
-void SetGadgetState(struct GadgetInfo *gi, boolean state)
+static void SetGadgetState(struct GadgetInfo *gi, boolean state)
{
if (gi == NULL)
return;
gi->checked = state;
}
-void RedrawSoundButtonGadget(int id)
+static void RedrawSoundButtonGadget(int id)
{
int id2 = (id == SOUND_CTRL_ID_MUSIC ? SOUND_CTRL_ID_PANEL_MUSIC :
id == SOUND_CTRL_ID_LOOPS ? SOUND_CTRL_ID_PANEL_LOOPS :
RedrawGameButtonsExt(TRUE);
}
-void GameUndoRedoExt(void)
+static void GameUndoRedoExt(void)
{
ClearPlayerAction();
BackToFront();
}
-void GameUndo(int steps)
+static void GameUndo(int steps)
{
if (!CheckEngineSnapshotList())
return;
GameUndoRedoExt();
}
-void GameRedo(int steps)
+static void GameRedo(int steps)
{
if (!CheckEngineSnapshotList())
return;
projects / rocksndiamonds.git / blobdiff