mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

implement game_command_set_park_name and game_command_remove_park_entrance

Browse Source
This commit is contained in:
IntelOrca
2015-01-27 21:18:30 +00:00
parent 21a33e8071
commit 36971b29cb
12 changed files with 209 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/windows/editor_objective_options.c
View File

@@ -25,6 +25,7 @@
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../scenario.h"
#include "../world/park.h"
#include "dropdown.h"
#include "error.h"
@@ -405,7 +406,7 @@ static void window_editor_objective_options_main_mouseup()
break;
case WIDX_PARK_NAME:
RCT2_GLOBAL(0x013CE962, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
window_text_input_open(w, WIDX_PARK_NAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, RCT2_GLOBAL(0x013573D4, rct_string_id), 0, 32);
window_text_input_open(w, WIDX_PARK_NAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME, rct_string_id), 0, 32);
break;
case WIDX_SCENARIO_NAME:
strcpy((char*)0x009BC677, s6Info->name);
@@ -799,13 +800,10 @@ static void window_editor_objective_options_main_textinput()
switch (widgetIndex) {
case WIDX_PARK_NAME:
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = STR_CANT_RENAME_PARK;
game_do_command(1, 1, 0, *((int*)(text + 0)), GAME_COMMAND_33, *((int*)(text + 8)), *((int*)(text + 4)));
game_do_command(2, 1, 0, *((int*)(text + 12)), GAME_COMMAND_33, *((int*)(text + 20)), *((int*)(text + 16)));
game_do_command(0, 1, 0, *((int*)(text + 24)), GAME_COMMAND_33, *((int*)(text + 32)), *((int*)(text + 28)));
park_set_name(text);
if (s6Info->name[0] == 0)
format_string(s6Info->name, RCT2_GLOBAL(0x013573D4, uint16), (void*)0x013573D8);
format_string(s6Info->name, RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME, rct_string_id), (void*)RCT2_ADDRESS_PARK_NAME_ARGS);
break;
case WIDX_SCENARIO_NAME:
strncpy(s6Info->name, text, 64);
@@ -1018,7 +1016,7 @@ static void window_editor_objective_options_main_paint()
if (stex != NULL) {
RCT2_GLOBAL(0x013CE952 + 0, uint16) = stex->park_name;
} else {
RCT2_GLOBAL(0x013CE952 + 0, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 0, uint16) = RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME, rct_string_id);
}
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x0013573D8, uint32);
gfx_draw_string_left_clipped(dpi, 3298, (void*)0x013CE952, 0, x, y, width);

4
src/windows/finances.c
View File

@@ -1239,8 +1239,8 @@ static void window_finances_marketing_paint()
continue;
noCampaignsActive = 0;
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME, rct_string_id);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME_ARGS, uint32);
// Set special parameters
switch (i) {

49
src/windows/park.c
View File

@@ -611,12 +611,18 @@ rct_window *window_park_open()
*
* rct2: 0x00667F8B
*/
void window_park_set_disabled_tabs(rct_window *w)
static void window_park_set_disabled_tabs(rct_window *w)
{
// Disable price tab if money is disabled
w->disabled_widgets = (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY) ? (1 << WIDX_TAB_4) : 0;
}
static void window_park_prepare_window_title_text()
{
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME, rct_string_id);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME_ARGS, uint32);
}
#pragma region Entrance page
/**
@@ -694,7 +700,7 @@ static void window_park_entrance_mouseup()
break;
case WIDX_RENAME:
RCT2_GLOBAL(0x013CE962, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
window_text_input_open(w, WIDX_RENAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, RCT2_GLOBAL(0x013573D4, rct_string_id), 0, 32);
window_text_input_open(w, WIDX_RENAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME, rct_string_id), 0, 32);
break;
}
}
@@ -867,14 +873,8 @@ static void window_park_entrance_textinput()
window_textinput_get_registers(w, widgetIndex, result, text);
if (widgetIndex == WIDX_RENAME) {
if (result) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = STR_CANT_RENAME_PARK;
game_do_command(1, 1, 0, *((int*)(text + 0)), GAME_COMMAND_33, *((int*)(text + 8)), *((int*)(text + 4)));
game_do_command(2, 1, 0, *((int*)(text + 12)), GAME_COMMAND_33, *((int*)(text + 20)), *((int*)(text + 16)));
game_do_command(0, 1, 0, *((int*)(text + 24)), GAME_COMMAND_33, *((int*)(text + 32)), *((int*)(text + 28)));
}
}
if (widgetIndex == WIDX_RENAME && result)
park_set_name(text);
}
/**
@@ -894,8 +894,8 @@ static void window_park_entrance_invalidate()
window_park_set_pressed_tab(w);
// Set open / close park button state
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME, rct_string_id);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(RCT2_ADDRESS_PARK_NAME_ARGS, uint32);
window_park_entrance_widgets[WIDX_OPEN_OR_CLOSE].image = park_is_open() ? SPR_OPEN : SPR_CLOSED;
// Only allow closing of park for guest / rating objective
@@ -1131,9 +1131,7 @@ static void window_park_rating_invalidate()
}
window_park_set_pressed_tab(w);
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
window_park_prepare_window_title_text();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
@@ -1266,9 +1264,7 @@ static void window_park_guests_invalidate()
}
window_park_set_pressed_tab(w);
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
window_park_prepare_window_title_text();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
@@ -1403,9 +1399,7 @@ static void window_park_price_invalidate()
}
window_park_set_pressed_tab(w);
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
window_park_prepare_window_title_text();
if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PARK_FREE_ENTRY) {
window_park_price_widgets[WIDX_PRICE].type = WWT_12;
@@ -1525,9 +1519,7 @@ static void window_park_stats_invalidate()
}
window_park_set_pressed_tab(w);
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
window_park_prepare_window_title_text();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);
@@ -1707,10 +1699,7 @@ static void window_park_objective_invalidate()
window_get_register(w);
window_park_set_pressed_tab(w);
// Set window title arguments
*((uint16*)0x013CE952) = RCT2_GLOBAL(0x013573D4, uint16);
*((uint32*)0x013CE954) = RCT2_GLOBAL(0x013573D8, uint32);
window_park_prepare_window_title_text();
//
if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT)
@@ -1861,9 +1850,7 @@ static void window_park_awards_invalidate()
}
window_park_set_pressed_tab(w);
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x013573D4, uint16);
RCT2_GLOBAL(0x013CE952 + 2, uint32) = RCT2_GLOBAL(0x013573D8, uint32);
window_park_prepare_window_title_text();
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7);
window_park_anchor_border_widgets(w);