mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor load_palette to call gfx_invalidate_screen 

Nearly all calls to load_palette were succeeded with a call to gfx_invalidate_screen. So remove these and stick just one call inside load_palette.
This commit is contained in:
Ted John 2017-06-07 23:24:18 +01:00
parent 945d960cb7
commit c1ccf2b7a6
7 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/drawing/drawing.c
View File

@ -515,7 +515,8 @@ void gfx_transpose_palette(sint32 pal, uint8 product)
* *
* rct2: 0x006837E3 * rct2: 0x006837E3
*/ */
void load_palette(){ void load_palette()
{
rct_water_type* water_type = (rct_water_type*)object_entry_groups[OBJECT_TYPE_WATER].chunks[0]; rct_water_type* water_type = (rct_water_type*)object_entry_groups[OBJECT_TYPE_WATER].chunks[0];
uint32 palette = 0x5FC; uint32 palette = 0x5FC;
@ -539,6 +540,7 @@ void load_palette(){
dest_pointer += 4; dest_pointer += 4;
} }
platform_update_palette(gGamePalette, 10, 236); platform_update_palette(gGamePalette, 10, 236);
gfx_invalidate_screen();
} }
/** /**

4
src/openrct2/editor.c
View File

@ -96,7 +96,6 @@ void editor_load()
rct_window *mainWindow = window_editor_main_open(); rct_window *mainWindow = window_editor_main_open();
window_set_location(mainWindow, 2400, 2400, 112); window_set_location(mainWindow, 2400, 2400, 112);
load_palette(); load_palette();
gfx_invalidate_screen();
gScreenAge = 0; gScreenAge = 0;
safe_strcpy(gScenarioName, language_get_string(STR_MY_NEW_SCENARIO), 64); safe_strcpy(gScenarioName, language_get_string(STR_MY_NEW_SCENARIO), 64);
@ -166,7 +165,6 @@ void trackdesigner_load()
rct_window * mainWindow = window_editor_main_open(); rct_window * mainWindow = window_editor_main_open();
window_set_location(mainWindow, 2400, 2400, 112); window_set_location(mainWindow, 2400, 2400, 112);
load_palette(); load_palette();
gfx_invalidate_screen();
} }
/** /**
@ -188,7 +186,6 @@ void trackmanager_load()
rct_window *mainWindow = window_editor_main_open(); rct_window *mainWindow = window_editor_main_open();
window_set_location(mainWindow, 2400, 2400, 112); window_set_location(mainWindow, 2400, 2400, 112);
load_palette(); load_palette();
gfx_invalidate_screen();
} }
/** /**
@ -437,7 +434,6 @@ static void editor_finalise_main_view()
window_new_ride_init_vars(); window_new_ride_init_vars();
gWindowUpdateTicks = 0; gWindowUpdateTicks = 0;
load_palette(); load_palette();
gfx_invalidate_screen();
window_tile_inspector_clear_clipboard(); window_tile_inspector_clear_clipboard();
} }

1
src/openrct2/game.c
View File

@ -1146,7 +1146,6 @@ void game_load_init()
gWindowUpdateTicks = 0; gWindowUpdateTicks = 0;
load_palette(); load_palette();
gfx_invalidate_screen();
if (!gOpenRCT2Headless) { if (!gOpenRCT2Headless) {
window_tile_inspector_clear_clipboard(); window_tile_inspector_clear_clipboard();

1
src/openrct2/intro.c
View File

@ -152,7 +152,6 @@ void intro_update()
case INTRO_STATE_FINISH: case INTRO_STATE_FINISH:
gIntroState = INTRO_STATE_NONE; gIntroState = INTRO_STATE_NONE;
load_palette(); load_palette();
gfx_invalidate_screen();
audio_start_title_music(); audio_start_title_music();
break; break;
} }

1
src/openrct2/object/WaterObject.cpp
View File

@ -40,7 +40,6 @@ void WaterObject::Load()
_legacyType.palette_index_2 = _legacyType.image_id + 4; _legacyType.palette_index_2 = _legacyType.image_id + 4;
load_palette(); load_palette();
gfx_invalidate_screen();
} }
void WaterObject::Unload() void WaterObject::Unload()

1
src/openrct2/scenario/scenario.c
View File

@ -267,7 +267,6 @@ void scenario_begin()
gParkFlags |= PARK_FLAGS_SPRITES_INITIALISED; gParkFlags |= PARK_FLAGS_SPRITES_INITIALISED;
load_palette(); load_palette();
gfx_invalidate_screen();
window_tile_inspector_clear_clipboard(); window_tile_inspector_clear_clipboard();
gScreenAge = 0; gScreenAge = 0;
gGameSpeed = 1; gGameSpeed = 1;

1
src/openrct2/title/TitleSequencePlayer.cpp
View File

@ -428,7 +428,6 @@ private:
scenery_set_default_placement_configuration(); scenery_set_default_placement_configuration();
news_item_init_queue(); news_item_init_queue();
load_palette(); load_palette();
gfx_invalidate_screen();
gScreenAge = 0; gScreenAge = 0;
gGameSpeed = 1; gGameSpeed = 1;
} }