X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=acba22e9b2f67838bbde1ba74c84b6bedf5fb9ab;hp=12397d5c4f262cf5367957a8c78e32c06f37f081;hb=823ae65fd14a8ab5e88adc0c711acecb2fb36955;hpb=99261bc36a147246e39cdc6d5ce9b098257c4d1b diff --git a/src/game.c b/src/game.c index 12397d5c..acba22e9 100644 --- a/src/game.c +++ b/src/game.c @@ -1683,28 +1683,28 @@ int GetElementFromGroupElement(int element) return element; } -static void IncrementPlayerSokobanFieldsNeeded(struct PlayerInfo *player) +static void IncrementSokobanFieldsNeeded(void) { if (level.sb_fields_needed) - player->sokoban_fields_still_needed++; + game.sokoban_fields_still_needed++; } -static void IncrementPlayerSokobanObjectsNeeded(struct PlayerInfo *player) +static void IncrementSokobanObjectsNeeded(void) { if (level.sb_objects_needed) - player->sokoban_objects_still_needed++; + game.sokoban_objects_still_needed++; } -static void DecrementPlayerSokobanFieldsNeeded(struct PlayerInfo *player) +static void DecrementSokobanFieldsNeeded(void) { - if (player->sokoban_fields_still_needed > 0) - player->sokoban_fields_still_needed--; + if (game.sokoban_fields_still_needed > 0) + game.sokoban_fields_still_needed--; } -static void DecrementPlayerSokobanObjectsNeeded(struct PlayerInfo *player) +static void DecrementSokobanObjectsNeeded(void) { - if (player->sokoban_objects_still_needed > 0) - player->sokoban_objects_still_needed--; + if (game.sokoban_objects_still_needed > 0) + game.sokoban_objects_still_needed--; } static void InitPlayerField(int x, int y, int element, boolean init_game) @@ -1816,11 +1816,11 @@ static void InitField(int x, int y, boolean init_game) break; case EL_SOKOBAN_FIELD_EMPTY: - IncrementPlayerSokobanFieldsNeeded(local_player); + IncrementSokobanFieldsNeeded(); break; case EL_SOKOBAN_OBJECT: - IncrementPlayerSokobanObjectsNeeded(local_player); + IncrementSokobanObjectsNeeded(); break; case EL_STONEBLOCK: @@ -1905,11 +1905,11 @@ static void InitField(int x, int y, boolean init_game) break; case EL_LAMP: - local_player->lights_still_needed++; + game.lights_still_needed++; break; case EL_PENGUIN: - local_player->friends_still_needed++; + game.friends_still_needed++; break; case EL_PIG: @@ -2207,8 +2207,8 @@ static void UpdatePlayfieldElementCount(void) static void UpdateGameControlValues(void) { int i, k; - int time = (local_player->LevelSolved ? - local_player->LevelSolved_CountingTime : + int time = (game.LevelSolved ? + game.LevelSolved_CountingTime : level.game_engine_type == GAME_ENGINE_TYPE_EM ? level.native_em_level->lev->time : level.game_engine_type == GAME_ENGINE_TYPE_SP ? @@ -2216,8 +2216,8 @@ static void UpdateGameControlValues(void) level.game_engine_type == GAME_ENGINE_TYPE_MM ? game_mm.energy_left : game.no_time_limit ? TimePlayed : TimeLeft); - int score = (local_player->LevelSolved ? - local_player->LevelSolved_CountingScore : + int score = (game.LevelSolved ? + game.LevelSolved_CountingScore : level.game_engine_type == GAME_ENGINE_TYPE_EM ? level.native_em_level->lev->score : level.game_engine_type == GAME_ENGINE_TYPE_SP ? @@ -2231,7 +2231,7 @@ static void UpdateGameControlValues(void) level.native_sp_level->game_sp->infotrons_still_needed : level.game_engine_type == GAME_ENGINE_TYPE_MM ? game_mm.kettles_still_needed : - local_player->gems_still_needed); + game.gems_still_needed); int exit_closed = (level.game_engine_type == GAME_ENGINE_TYPE_EM ? level.native_em_level->lev->required > 0 : level.game_engine_type == GAME_ENGINE_TYPE_SP ? @@ -2239,12 +2239,12 @@ static void UpdateGameControlValues(void) level.game_engine_type == GAME_ENGINE_TYPE_MM ? game_mm.kettles_still_needed > 0 || game_mm.lights_still_needed > 0 : - local_player->gems_still_needed > 0 || - local_player->sokoban_fields_still_needed > 0 || - local_player->sokoban_objects_still_needed > 0 || - local_player->lights_still_needed > 0); - int health = (local_player->LevelSolved ? - local_player->LevelSolved_CountingHealth : + game.gems_still_needed > 0 || + game.sokoban_fields_still_needed > 0 || + game.sokoban_objects_still_needed > 0 || + game.lights_still_needed > 0); + int health = (game.LevelSolved ? + game.LevelSolved_CountingHealth : level.game_engine_type == GAME_ENGINE_TYPE_MM ? MM_HEALTH(game_mm.laser_overload_value) : local_player->health); @@ -2407,12 +2407,12 @@ static void UpdateGameControlValues(void) (local_player->dynabomb_xl ? EL_DYNABOMB_INCREASE_POWER : EL_EMPTY); game_panel_controls[GAME_PANEL_PENGUINS].value = - local_player->friends_still_needed; + game.friends_still_needed; game_panel_controls[GAME_PANEL_SOKOBAN_OBJECTS].value = - local_player->sokoban_objects_still_needed; + game.sokoban_objects_still_needed; game_panel_controls[GAME_PANEL_SOKOBAN_FIELDS].value = - local_player->sokoban_fields_still_needed; + game.sokoban_fields_still_needed; game_panel_controls[GAME_PANEL_ROBOT_WHEEL].value = (game.robot_wheel_active ? EL_ROBOT_WHEEL_ACTIVE : EL_ROBOT_WHEEL); @@ -3417,13 +3417,6 @@ void InitGame(void) player->health = MAX_HEALTH; player->health_final = MAX_HEALTH; - player->gems_still_needed = level.gems_needed; - player->sokoban_fields_still_needed = 0; - player->sokoban_objects_still_needed = 0; - player->lights_still_needed = 0; - player->players_still_needed = 0; - player->friends_still_needed = 0; - for (j = 0; j < MAX_NUM_KEYS; j++) player->key[j] = FALSE; @@ -3546,18 +3539,8 @@ void InitGame(void) DigField(player, 0, 0, 0, 0, 0, 0, DF_NO_PUSH); SnapField(player, 0, 0); - player->LevelSolved = FALSE; player->GameOver = FALSE; - player->LevelSolved_GameWon = FALSE; - player->LevelSolved_GameEnd = FALSE; - player->LevelSolved_SaveTape = FALSE; - player->LevelSolved_SaveScore = FALSE; - - player->LevelSolved_CountingTime = 0; - player->LevelSolved_CountingScore = 0; - player->LevelSolved_CountingHealth = 0; - map_player_action[i] = i; } @@ -3584,6 +3567,17 @@ void InitGame(void) AllPlayersGone = FALSE; + game.LevelSolved = FALSE; + + game.LevelSolved_GameWon = FALSE; + game.LevelSolved_GameEnd = FALSE; + game.LevelSolved_SaveTape = FALSE; + game.LevelSolved_SaveScore = FALSE; + + game.LevelSolved_CountingTime = 0; + game.LevelSolved_CountingScore = 0; + game.LevelSolved_CountingHealth = 0; + game.panel.active = TRUE; game.no_time_limit = (level.time == 0); @@ -3597,6 +3591,13 @@ void InitGame(void) game.switchgate_pos = 0; game.wind_direction = level.wind_direction_initial; + game.gems_still_needed = level.gems_needed; + game.sokoban_fields_still_needed = 0; + game.sokoban_objects_still_needed = 0; + game.lights_still_needed = 0; + game.players_still_needed = 0; + game.friends_still_needed = 0; + game.lenses_time_left = 0; game.magnify_time_left = 0; @@ -3984,10 +3985,10 @@ void InitGame(void) for (i = 0; i < MAX_PLAYERS; i++) if (stored_player[i].active) - local_player->players_still_needed++; + game.players_still_needed++; if (level.solved_by_one_player) - local_player->players_still_needed = 1; + game.players_still_needed = 1; // when recording the game, store which players take part in the game if (tape.recording) @@ -4456,28 +4457,28 @@ void InitAmoebaNr(int x, int y) AmoebaCnt2[group_nr]++; } -static void PlayerWins(struct PlayerInfo *player) +static void LevelSolved(void) { if (level.game_engine_type == GAME_ENGINE_TYPE_RND && - local_player->players_still_needed > 0) + game.players_still_needed > 0) return; - player->LevelSolved = TRUE; - player->GameOver = TRUE; + game.LevelSolved = TRUE; + + local_player->GameOver = TRUE; - player->score_final = (level.game_engine_type == GAME_ENGINE_TYPE_EM ? - level.native_em_level->lev->score : - level.game_engine_type == GAME_ENGINE_TYPE_MM ? - game_mm.score : - player->score); - player->health_final = (level.game_engine_type == GAME_ENGINE_TYPE_MM ? - MM_HEALTH(game_mm.laser_overload_value) : - player->health); + local_player->score_final = (level.game_engine_type == GAME_ENGINE_TYPE_EM ? + level.native_em_level->lev->score : + level.game_engine_type == GAME_ENGINE_TYPE_MM ? + game_mm.score : + local_player->score); + local_player->health_final = (level.game_engine_type == GAME_ENGINE_TYPE_MM ? + MM_HEALTH(game_mm.laser_overload_value) : + local_player->health); - player->LevelSolved_CountingTime = (game.no_time_limit ? TimePlayed : - TimeLeft); - player->LevelSolved_CountingScore = player->score_final; - player->LevelSolved_CountingHealth = player->health_final; + game.LevelSolved_CountingTime = (game.no_time_limit ? TimePlayed : TimeLeft); + game.LevelSolved_CountingScore = local_player->score_final; + game.LevelSolved_CountingHealth = local_player->health_final; } void GameWon(void) @@ -4493,7 +4494,7 @@ void GameWon(void) int game_over_delay_value_2 = 25; int game_over_delay_value_3 = 50; - if (!local_player->LevelSolved_GameWon) + if (!game.LevelSolved_GameWon) { int i; @@ -4501,9 +4502,9 @@ void GameWon(void) if (local_player->MovPos) return; - local_player->LevelSolved_GameWon = TRUE; - local_player->LevelSolved_SaveTape = tape.recording; - local_player->LevelSolved_SaveScore = !tape.playing; + game.LevelSolved_GameWon = TRUE; + game.LevelSolved_SaveTape = tape.recording; + game.LevelSolved_SaveScore = !tape.playing; if (!tape.playing) { @@ -4559,8 +4560,8 @@ void GameWon(void) time = time_final; score = score_final; - local_player->LevelSolved_CountingTime = time; - local_player->LevelSolved_CountingScore = score; + game.LevelSolved_CountingTime = time; + game.LevelSolved_CountingScore = score; game_panel_controls[GAME_PANEL_TIME].value = time; game_panel_controls[GAME_PANEL_SCORE].value = score; @@ -4631,8 +4632,8 @@ void GameWon(void) time += time_count_steps * time_count_dir; score += time_count_steps * level.score[SC_TIME_BONUS]; - local_player->LevelSolved_CountingTime = time; - local_player->LevelSolved_CountingScore = score; + game.LevelSolved_CountingTime = time; + game.LevelSolved_CountingScore = score; game_panel_controls[GAME_PANEL_TIME].value = time; game_panel_controls[GAME_PANEL_SCORE].value = score; @@ -4663,8 +4664,8 @@ void GameWon(void) health += health_count_dir; score += level.score[SC_TIME_BONUS]; - local_player->LevelSolved_CountingHealth = health; - local_player->LevelSolved_CountingScore = score; + game.LevelSolved_CountingHealth = health; + game.LevelSolved_CountingScore = score; game_panel_controls[GAME_PANEL_HEALTH].value = health; game_panel_controls[GAME_PANEL_SCORE].value = score; @@ -4699,9 +4700,9 @@ void GameEnd(void) int last_level_nr = levelset.level_nr; int hi_pos; - local_player->LevelSolved_GameEnd = TRUE; + game.LevelSolved_GameEnd = TRUE; - if (local_player->LevelSolved_SaveTape) + if (game.LevelSolved_SaveTape) { // make sure that request dialog to save tape does not open door again if (!global.use_envelope_request) @@ -4722,7 +4723,7 @@ void GameEnd(void) return; } - if (!local_player->LevelSolved_SaveScore) + if (!game.LevelSolved_SaveScore) { SetGameStatus(GAME_MODE_MAIN); @@ -7948,10 +7949,10 @@ static void StartMoving(int x, int y) if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy))) DrawGraphicThruMask(SCREENX(newx),SCREENY(newy), el2img(element), 0); - local_player->friends_still_needed--; - if (!local_player->friends_still_needed && + game.friends_still_needed--; + if (!game.friends_still_needed && !local_player->GameOver && AllPlayersGone) - PlayerWins(local_player); + LevelSolved(); return; } @@ -9082,10 +9083,10 @@ static void ActivateMagicBall(int bx, int by) static void CheckExit(int x, int y) { - if (local_player->gems_still_needed > 0 || - local_player->sokoban_fields_still_needed > 0 || - local_player->sokoban_objects_still_needed > 0 || - local_player->lights_still_needed > 0) + if (game.gems_still_needed > 0 || + game.sokoban_fields_still_needed > 0 || + game.sokoban_objects_still_needed > 0 || + game.lights_still_needed > 0) { int element = Feld[x][y]; int graphic = el2img(element); @@ -9106,10 +9107,10 @@ static void CheckExit(int x, int y) static void CheckExitEM(int x, int y) { - if (local_player->gems_still_needed > 0 || - local_player->sokoban_fields_still_needed > 0 || - local_player->sokoban_objects_still_needed > 0 || - local_player->lights_still_needed > 0) + if (game.gems_still_needed > 0 || + game.sokoban_fields_still_needed > 0 || + game.sokoban_objects_still_needed > 0 || + game.lights_still_needed > 0) { int element = Feld[x][y]; int graphic = el2img(element); @@ -9130,10 +9131,10 @@ static void CheckExitEM(int x, int y) static void CheckExitSteel(int x, int y) { - if (local_player->gems_still_needed > 0 || - local_player->sokoban_fields_still_needed > 0 || - local_player->sokoban_objects_still_needed > 0 || - local_player->lights_still_needed > 0) + if (game.gems_still_needed > 0 || + game.sokoban_fields_still_needed > 0 || + game.sokoban_objects_still_needed > 0 || + game.lights_still_needed > 0) { int element = Feld[x][y]; int graphic = el2img(element); @@ -9154,10 +9155,10 @@ static void CheckExitSteel(int x, int y) static void CheckExitSteelEM(int x, int y) { - if (local_player->gems_still_needed > 0 || - local_player->sokoban_fields_still_needed > 0 || - local_player->sokoban_objects_still_needed > 0 || - local_player->lights_still_needed > 0) + if (game.gems_still_needed > 0 || + game.sokoban_fields_still_needed > 0 || + game.sokoban_objects_still_needed > 0 || + game.lights_still_needed > 0) { int element = Feld[x][y]; int graphic = el2img(element); @@ -9178,7 +9179,7 @@ static void CheckExitSteelEM(int x, int y) static void CheckExitSP(int x, int y) { - if (local_player->gems_still_needed > 0) + if (game.gems_still_needed > 0) { int element = Feld[x][y]; int graphic = el2img(element); @@ -9705,7 +9706,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) action_arg == CA_ARG_NUMBER_CE_SCORE ? ei->collect_score : action_arg == CA_ARG_NUMBER_CE_DELAY ? GET_CE_DELAY_VALUE(change) : action_arg == CA_ARG_NUMBER_LEVEL_TIME ? level_time_value : - action_arg == CA_ARG_NUMBER_LEVEL_GEMS ? local_player->gems_still_needed : + action_arg == CA_ARG_NUMBER_LEVEL_GEMS ? game.gems_still_needed : action_arg == CA_ARG_NUMBER_LEVEL_SCORE ? local_player->score : action_arg == CA_ARG_ELEMENT_CV_TARGET ? GET_NEW_CE_VALUE(target_element): action_arg == CA_ARG_ELEMENT_CV_TRIGGER ? change->actual_trigger_ce_value: @@ -9719,7 +9720,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) -1); int action_arg_number_old = - (action_type == CA_SET_LEVEL_GEMS ? local_player->gems_still_needed : + (action_type == CA_SET_LEVEL_GEMS ? game.gems_still_needed : action_type == CA_SET_LEVEL_TIME ? TimeLeft : action_type == CA_SET_LEVEL_SCORE ? local_player->score : action_type == CA_SET_CE_VALUE ? CustomValue[x][y] : @@ -9802,12 +9803,11 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) case CA_SET_LEVEL_GEMS: { - local_player->gems_still_needed = action_arg_number_new; + game.gems_still_needed = action_arg_number_new; game.snapshot.collected_item = TRUE; - game_panel_controls[GAME_PANEL_GEMS].value = - local_player->gems_still_needed; + game_panel_controls[GAME_PANEL_GEMS].value = game.gems_still_needed; DisplayGameControlValues(); @@ -9848,7 +9848,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) ExitPlayer(&stored_player[i]); if (AllPlayersGone) - PlayerWins(local_player); + LevelSolved(); break; } @@ -11120,7 +11120,7 @@ static void CheckLevelSolved(void) if (game_em.level_solved && !game_em.game_over) // game won { - PlayerWins(local_player); + LevelSolved(); game_em.game_over = TRUE; @@ -11135,7 +11135,7 @@ static void CheckLevelSolved(void) if (game_sp.level_solved && !game_sp.game_over) // game won { - PlayerWins(local_player); + LevelSolved(); game_sp.game_over = TRUE; @@ -11150,7 +11150,7 @@ static void CheckLevelSolved(void) if (game_mm.level_solved && !game_mm.game_over) // game won { - PlayerWins(local_player); + LevelSolved(); game_mm.game_over = TRUE; @@ -11184,7 +11184,7 @@ static void CheckLevelTime(void) } } - if (!local_player->LevelSolved && !level.use_step_counter) + if (!game.LevelSolved && !level.use_step_counter) { TimePlayed++; @@ -11331,7 +11331,7 @@ static void GameActionsExt(void) CheckLevelSolved(); - if (local_player->LevelSolved && !local_player->LevelSolved_GameEnd) + if (game.LevelSolved && !game.LevelSolved_GameEnd) GameWon(); if (AllPlayersGone && !TAPE_IS_STOPPED(tape)) @@ -12674,10 +12674,10 @@ void ScrollPlayer(struct PlayerInfo *player, int mode) { ExitPlayer(player); - if ((local_player->friends_still_needed == 0 || + if ((game.friends_still_needed == 0 || IS_SP_ELEMENT(Feld[jx][jy])) && AllPlayersGone) - PlayerWins(local_player); + LevelSolved(); } // this breaks one level: "machine", level 000 @@ -12725,7 +12725,7 @@ void ScrollPlayer(struct PlayerInfo *player, int mode) RemovePlayer(player); } - if (!local_player->LevelSolved && level.use_step_counter) + if (!game.LevelSolved && level.use_step_counter) { int i; @@ -13438,11 +13438,11 @@ void ExitPlayer(struct PlayerInfo *player) DrawPlayer(player); // needed here only to cleanup last field RemovePlayer(player); - if (local_player->players_still_needed > 0) - local_player->players_still_needed--; + if (game.players_still_needed > 0) + game.players_still_needed--; // also set if some players not yet gone, but not needed to solve level - if (local_player->players_still_needed == 0) + if (game.players_still_needed == 0) AllPlayersGone = TRUE; } @@ -13853,13 +13853,13 @@ static int DigField(struct PlayerInfo *player, } else if (collect_count > 0) { - local_player->gems_still_needed -= collect_count; - if (local_player->gems_still_needed < 0) - local_player->gems_still_needed = 0; + game.gems_still_needed -= collect_count; + if (game.gems_still_needed < 0) + game.gems_still_needed = 0; game.snapshot.collected_item = TRUE; - game_panel_controls[GAME_PANEL_GEMS].value = local_player->gems_still_needed; + game_panel_controls[GAME_PANEL_GEMS].value = game.gems_still_needed; DisplayGameControlValues(); } @@ -13971,16 +13971,16 @@ static int DigField(struct PlayerInfo *player, { Back[x][y] = EL_SOKOBAN_FIELD_EMPTY; - IncrementPlayerSokobanFieldsNeeded(local_player); - IncrementPlayerSokobanObjectsNeeded(local_player); + IncrementSokobanFieldsNeeded(); + IncrementSokobanObjectsNeeded(); } if (Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY) { Back[nextx][nexty] = EL_SOKOBAN_FIELD_EMPTY; - DecrementPlayerSokobanFieldsNeeded(local_player); - DecrementPlayerSokobanObjectsNeeded(local_player); + DecrementSokobanFieldsNeeded(); + DecrementSokobanObjectsNeeded(); // sokoban object was pushed from empty field to sokoban field if (Back[x][y] == EL_EMPTY) @@ -13999,13 +13999,13 @@ static int DigField(struct PlayerInfo *player, ACTION_FILLING); if (sokoban_task_solved && - local_player->sokoban_fields_still_needed == 0 && - local_player->sokoban_objects_still_needed == 0 && + game.sokoban_fields_still_needed == 0 && + game.sokoban_objects_still_needed == 0 && (game.emulation == EMU_SOKOBAN || level.auto_exit_sokoban)) { - local_player->players_still_needed = 0; + game.players_still_needed = 0; - PlayerWins(local_player); + LevelSolved(); PlayLevelSound(x, y, SND_GAME_SOKOBAN_SOLVING); } @@ -14121,7 +14121,7 @@ static int DigField(struct PlayerInfo *player, else if (element == EL_LAMP) { Feld[x][y] = EL_LAMP_ACTIVE; - local_player->lights_still_needed--; + game.lights_still_needed--; ResetGfxAnimation(x, y); TEST_DrawLevelField(x, y); @@ -15030,7 +15030,7 @@ void CheckGameOver(void) boolean checkGameSolved(void) { // set for all game engines if level was solved - return local_player->LevelSolved_GameEnd; + return game.LevelSolved_GameEnd; } boolean checkGameFailed(void) @@ -15045,7 +15045,7 @@ boolean checkGameFailed(void) else if (level.game_engine_type == GAME_ENGINE_TYPE_MM) return (game_mm.game_over && !game_mm.level_solved); else // GAME_ENGINE_TYPE_RND - return (local_player->GameOver && !local_player->LevelSolved); + return (local_player->GameOver && !game.LevelSolved); } boolean checkGameEnded(void)