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

Use constant for LOCATION_NULL, split off location stuff to Location.h

Browse Source
This commit is contained in:
Michael Steenbeek
2017-10-13 22:23:07 +02:00
committed by GitHub
parent ab3835719a
commit 7f9c25a7a9
118 changed files with 954 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@@ -111,7 +111,7 @@ static void window_title_command_editor_textinput(rct_window *w, rct_widgetindex
static void window_title_command_editor_inputsize(rct_window *w);
static sint32 get_command_info_index(sint32 index);
static TITLE_COMMAND_ORDER get_command_info(sint32 index);
static rct_xy16 get_location();
static LocationXY16 get_location();
static uint8 get_zoom();
static rct_window_event_list window_title_command_editor_events = {
@@ -163,9 +163,9 @@ static TITLE_COMMAND_ORDER get_command_info(sint32 index)
return _window_title_command_editor_orders[0];
}
static rct_xy16 get_location()
static LocationXY16 get_location()
{
rct_xy16 mapCoord = { 0 };
LocationXY16 mapCoord = { 0 };
rct_window *w = window_get_main();
if (w != nullptr) {
sint32 interactionType;
@@ -274,7 +274,7 @@ static void window_title_command_editor_mouseup(rct_window *w, rct_widgetindex w
break;
case WIDX_GET:
if (command.Type == TITLE_SCRIPT_LOCATION) {
rct_xy16 mapCoord = get_location();
LocationXY16 mapCoord = get_location();
command.X = (uint8)mapCoord.x;
command.Y = (uint8)mapCoord.y;
snprintf(textbox1Buffer, BUF_SIZE, "%d", command.X);
@@ -391,7 +391,7 @@ static void window_title_command_editor_dropdown(rct_window *w, rct_widgetindex
switch (command.Type) {
case TITLE_SCRIPT_LOCATION:
{
rct_xy16 mapCoord = get_location();
LocationXY16 mapCoord = get_location();
command.X = (uint8)mapCoord.x;
command.Y = (uint8)mapCoord.y;
snprintf(textbox1Buffer, BUF_SIZE, "%d", command.X);