1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-21 23:03:04 +01:00

Fix #3963: Messages ignore paused game

This commit is contained in:
Ted John
2016-10-02 01:49:58 +01:00
parent 305e6184f8
commit c333b0c4df
2 changed files with 3 additions and 3 deletions

View File

@@ -310,7 +310,6 @@ void game_update()
scenario_autosave_check(); scenario_autosave_check();
network_update(); network_update();
news_item_update_current();
window_dispatch_update_all(); window_dispatch_update_all();
gGameCommandNestLevel = 0; gGameCommandNestLevel = 0;
@@ -376,6 +375,7 @@ void game_logic_update()
research_update(); research_update();
ride_ratings_update_all(); ride_ratings_update_all();
ride_measurements_update(); ride_measurements_update();
news_item_update_current();
/////////////////////////// ///////////////////////////
gInUpdateCode = false; gInUpdateCode = false;
/////////////////////////// ///////////////////////////

View File

@@ -269,11 +269,13 @@ static void window_game_bottom_toolbar_invalidate(rct_window *w)
window_game_bottom_toolbar_widgets[WIDX_RIGHT_INSET].type = WWT_EMPTY; window_game_bottom_toolbar_widgets[WIDX_RIGHT_INSET].type = WWT_EMPTY;
if (news_item_is_queue_empty()) { if (news_item_is_queue_empty()) {
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].type = WWT_EMPTY;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_EMPTY; window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_EMPTY;
window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].type = WWT_EMPTY; window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].type = WWT_EMPTY;
window_game_bottom_toolbar_widgets[WIDX_NEWS_LOCATE].type = WWT_EMPTY; window_game_bottom_toolbar_widgets[WIDX_NEWS_LOCATE].type = WWT_EMPTY;
} else { } else {
newsItem = news_item_get(0); newsItem = news_item_get(0);
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].type = WWT_IMGBTN;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_25; window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_25;
window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].type = WWT_FLATBTN; window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].type = WWT_FLATBTN;
window_game_bottom_toolbar_widgets[WIDX_NEWS_LOCATE].type = WWT_FLATBTN; window_game_bottom_toolbar_widgets[WIDX_NEWS_LOCATE].type = WWT_FLATBTN;
@@ -320,8 +322,6 @@ static void window_game_bottom_toolbar_invalidate(rct_window *w)
void window_game_bottom_toolbar_invalidate_news_item() void window_game_bottom_toolbar_invalidate_news_item()
{ {
if (gScreenFlags == SCREEN_FLAGS_PLAYING) { if (gScreenFlags == SCREEN_FLAGS_PLAYING) {
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].type =
news_item_is_queue_empty() ? WWT_EMPTY : WWT_IMGBTN;
widget_invalidate_by_class(WC_BOTTOM_TOOLBAR, WIDX_MIDDLE_OUTSET); widget_invalidate_by_class(WC_BOTTOM_TOOLBAR, WIDX_MIDDLE_OUTSET);
} }
} }