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

Move Error, Campaign and Ride Demolition windows

Browse Source
This commit is contained in:
Marijn van der Werf
2017-09-06 16:09:35 +02:00
parent a49a777047
commit ac910a5979
38 changed files with 188 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/windows/EditorBottomToolbar.cpp
View File

@@ -26,7 +26,6 @@
#include "../interface/themes.h"
#include "../interface/widget.h"
#include "../world/scenery.h"
#include "error.h"
enum {
WIDX_PREVIOUS_IMAGE, // 1
@@ -203,7 +202,7 @@ static bool window_editor_bottom_toolbar_check_object_selection()
return true;
}
window_error_open(STR_INVALID_SELECTION_OF_OBJECTS, gGameCommandErrorText);
context_show_error(STR_INVALID_SELECTION_OF_OBJECTS, gGameCommandErrorText);
w = window_find_by_class(WC_EDITOR_OBJECT_SELECTION);
if (w != nullptr) {
// Click tab with missing object
@@ -249,7 +248,7 @@ void window_editor_bottom_toolbar_jump_forward_to_invention_list_set_up()
}
else
{
window_error_open(STR_CANT_ADVANCE_TO_NEXT_EDITOR_STAGE, gGameCommandErrorText);
context_show_error(STR_CANT_ADVANCE_TO_NEXT_EDITOR_STAGE, gGameCommandErrorText);
}
gfx_invalidate_screen();
@@ -285,7 +284,7 @@ void window_editor_bottom_toolbar_jump_forward_to_objective_selection() {
void window_editor_bottom_toolbar_jump_forward_to_save_scenario()
{
if (!scenario_prepare_for_save()) {
window_error_open(STR_UNABLE_TO_SAVE_SCENARIO_FILE, gGameCommandErrorText);
context_show_error(STR_UNABLE_TO_SAVE_SCENARIO_FILE, gGameCommandErrorText);
gfx_invalidate_screen();
return;
}