From: Holger Schemel Date: Fri, 12 Oct 2018 15:51:04 +0000 (+0200) Subject: moved flag for active/inactive game panel from player to game structure X-Git-Tag: 4.1.2.0~138 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=0a414fc94edd4a357908a9eafed7e893da23bec3;p=rocksndiamonds.git moved flag for active/inactive game panel from player to game structure --- diff --git a/src/game.c b/src/game.c index 572bd209..b80d8585 100644 --- a/src/game.c +++ b/src/game.c @@ -81,7 +81,7 @@ #define EX_TYPE_DYNA (1 << 4) #define EX_TYPE_SINGLE_TILE (EX_TYPE_CENTER | EX_TYPE_BORDER) -#define PANEL_OFF() (local_player->LevelSolved_PanelOff) +#define PANEL_OFF() (game.panel.active == FALSE) #define PANEL_DEACTIVATED(p) ((p)->x < 0 || (p)->y < 0 || PANEL_OFF()) #define PANEL_XPOS(p) (DX + ALIGNED_TEXT_XPOS(p)) #define PANEL_YPOS(p) (DY + ALIGNED_TEXT_YPOS(p)) @@ -3525,7 +3525,6 @@ void InitGame(void) player->LevelSolved_GameWon = FALSE; player->LevelSolved_GameEnd = FALSE; - player->LevelSolved_PanelOff = FALSE; player->LevelSolved_SaveTape = FALSE; player->LevelSolved_SaveScore = FALSE; @@ -3559,6 +3558,8 @@ void InitGame(void) AllPlayersGone = FALSE; + game.panel.active = TRUE; + game.no_time_limit = (level.time == 0); game.yamyam_content_nr = 0; @@ -4653,7 +4654,7 @@ void GameWon(void) return; } - local_player->LevelSolved_PanelOff = TRUE; + game.panel.active = FALSE; if (game_over_delay_3 > 0) { diff --git a/src/game.h b/src/game.h index b6e9f5b0..947d4662 100644 --- a/src/game.h +++ b/src/game.h @@ -100,6 +100,9 @@ struct GamePanelInfo struct TextPosInfo player_name; struct TextPosInfo level_name; struct TextPosInfo level_author; + + /* value to determine if panel will be updated or not */ + boolean active; }; struct GameButtonInfo @@ -266,7 +269,6 @@ struct PlayerInfo boolean LevelSolved_GameWon; boolean LevelSolved_GameEnd; - boolean LevelSolved_PanelOff; boolean LevelSolved_SaveTape; boolean LevelSolved_SaveScore;