mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge branch 'pre-release-0.0.2' into HEAD
This commit is contained in:
commit
f4c46c479d
|
@ -133,8 +133,10 @@ void title_load()
|
||||||
gfx_invalidate_screen();
|
gfx_invalidate_screen();
|
||||||
RCT2_GLOBAL(0x009DEA66, uint16) = 0;
|
RCT2_GLOBAL(0x009DEA66, uint16) = 0;
|
||||||
|
|
||||||
if (gOpenRCT2ShowChangelog)
|
if (gOpenRCT2ShowChangelog) {
|
||||||
|
gOpenRCT2ShowChangelog = false;
|
||||||
window_changelog_open();
|
window_changelog_open();
|
||||||
|
}
|
||||||
|
|
||||||
log_verbose("loading title finished");
|
log_verbose("loading title finished");
|
||||||
}
|
}
|
||||||
|
|
|
@ -602,16 +602,19 @@ static void window_scenery_resize()
|
||||||
window_get_register(w);
|
window_get_register(w);
|
||||||
|
|
||||||
if (w->width < w->min_width) {
|
if (w->width < w->min_width) {
|
||||||
|
window_invalidate(w);
|
||||||
w->width = w->min_width;
|
w->width = w->min_width;
|
||||||
window_invalidate(w);
|
window_invalidate(w);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (w->width > w->max_width) {
|
if (w->width > w->max_width) {
|
||||||
|
window_invalidate(w);
|
||||||
w->width = w->max_width;
|
w->width = w->max_width;
|
||||||
window_invalidate(w);
|
window_invalidate(w);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (w->height < w->min_height) {
|
if (w->height < w->min_height) {
|
||||||
|
window_invalidate(w);
|
||||||
w->height = w->min_height;
|
w->height = w->min_height;
|
||||||
window_invalidate(w);
|
window_invalidate(w);
|
||||||
// HACK: For some reason invalidate has not been called
|
// HACK: For some reason invalidate has not been called
|
||||||
|
@ -620,6 +623,7 @@ static void window_scenery_resize()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (w->height > w->max_height) {
|
if (w->height > w->max_height) {
|
||||||
|
window_invalidate(w);
|
||||||
w->height = w->max_height;
|
w->height = w->max_height;
|
||||||
window_invalidate(w);
|
window_invalidate(w);
|
||||||
// HACK: For some reason invalidate has not been called
|
// HACK: For some reason invalidate has not been called
|
||||||
|
@ -736,7 +740,7 @@ static void window_scenery_update(rct_window *w)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx_invalidate_screen();
|
window_invalidate(w);
|
||||||
|
|
||||||
if (!window_scenery_is_scenery_tool_active()){
|
if (!window_scenery_is_scenery_tool_active()){
|
||||||
window_close(w);
|
window_close(w);
|
||||||
|
|
Loading…
Reference in New Issue