mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ride-update

Browse Source 
Conflicts:
	projects/openrct2.vcxproj.filters
This commit is contained in:
IntelOrca
2014-11-03 17:37:08 +00:00
parent 3ecfee72a2 e2ed908a79
commit 8ab3188914
20 changed files with 1035 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/interface/viewport.c
View File

@@ -289,7 +289,6 @@ void viewport_update_position(rct_window *window)
center_2d_coordinates(sprite->unknown.x, sprite->unknown.y, sprite->unknown.z, &center_x, &center_y, window->viewport);
RCT2_CALLPROC_X(0x6E7DE1, center_x, center_y, 0, 0, (int)window, (int)viewport, 0);
window_invalidate(window);//Added to force a redraw.
return;
}

3
src/interface/window.h
View File

@@ -501,11 +501,14 @@ void window_finances_open();
void window_finances_research_open();
void window_new_campaign_open(sint16 campaignType);
rct_window *window_ride_main_open(int rideIndex);
void window_ride_demolish_prompt_open(int rideIndex);
void window_ride_construct(rct_window *w);
void window_ride_list_open();
void window_track_place_open();
void window_new_ride_open();
void window_banner_open(rct_windownumber number);
void window_sign_open(rct_windownumber number);
void window_sign_small_open(rct_windownumber number);
void window_cheats_open();
void window_research_open();
void window_scenery_open();