mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7519 from IntelOrca/refactor/new-object-types-prep 

Refactor code around object types
This commit is contained in:
Aaron van Geffen 2018-05-15 15:10:16 +02:00 committed by GitHub
parent 19442eb6c2 58241d33fc
commit 829ac11bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 259 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -69,7 +69,7 @@ enum
static constexpr uint8 _numSourceGameItems = 8; static constexpr uint8 _numSourceGameItems = 8;
static uint32 _filter_flags; static uint32 _filter_flags;
static uint16 _filter_object_counts[11]; static uint16 _filter_object_counts[OBJECT_TYPE_COUNT];
static char _filter_string[MAX_PATH]; static char _filter_string[MAX_PATH];
@ -85,58 +85,42 @@ static char _filter_string[MAX_PATH];
#define _FILTER_SELECTED (_filter_flags & FILTER_SELECTED) #define _FILTER_SELECTED (_filter_flags & FILTER_SELECTED)
#define _FILTER_NONSELECTED (_filter_flags & FILTER_NONSELECTED) #define _FILTER_NONSELECTED (_filter_flags & FILTER_NONSELECTED)
enum { struct ObjectPageDesc
WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS, {
WINDOW_OBJECT_SELECTION_PAGE_SMALL_SCENERY, rct_string_id Caption;
WINDOW_OBJECT_SELECTION_PAGE_LARGE_SCENERY, uint32 Image;
WINDOW_OBJECT_SELECTION_PAGE_WALLS_FENCES, bool IsAdvanced;
WINDOW_OBJECT_SELECTION_PAGE_PATH_SIGNS,
WINDOW_OBJECT_SELECTION_PAGE_FOOTPATHS,
WINDOW_OBJECT_SELECTION_PAGE_PATH_EXTRAS,
WINDOW_OBJECT_SELECTION_PAGE_SCENERY_GROUPS,
WINDOW_OBJECT_SELECTION_PAGE_PARK_ENTRANCE,
WINDOW_OBJECT_SELECTION_PAGE_WATER,
WINDOW_OBJECT_SELECTION_PAGE_COUNT
}; };
static constexpr const rct_string_id ObjectSelectionPageNames[WINDOW_OBJECT_SELECTION_PAGE_COUNT] = { static constexpr const ObjectPageDesc ObjectSelectionPages[OBJECT_TYPE_COUNT] = {
STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS, { STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS, SPR_TAB_RIDE_16, false },
STR_OBJECT_SELECTION_SMALL_SCENERY, { STR_OBJECT_SELECTION_SMALL_SCENERY, SPR_TAB_SCENERY_TREES, true },
STR_OBJECT_SELECTION_LARGE_SCENERY, { STR_OBJECT_SELECTION_LARGE_SCENERY, SPR_TAB_SCENERY_URBAN, true },
STR_OBJECT_SELECTION_WALLS_FENCES, { STR_OBJECT_SELECTION_WALLS_FENCES, SPR_TAB_SCENERY_WALLS, true },
STR_OBJECT_SELECTION_PATH_SIGNS, { STR_OBJECT_SELECTION_PATH_SIGNS, SPR_TAB_SCENERY_SIGNAGE, true },
STR_OBJECT_SELECTION_FOOTPATHS, { STR_OBJECT_SELECTION_FOOTPATHS, SPR_TAB_SCENERY_PATHS, false },
STR_OBJECT_SELECTION_PATH_EXTRAS, { STR_OBJECT_SELECTION_PATH_EXTRAS, SPR_TAB_SCENERY_PATH_ITEMS, false },
STR_OBJECT_SELECTION_SCENERY_GROUPS, { STR_OBJECT_SELECTION_SCENERY_GROUPS, SPR_TAB_SCENERY_STATUES, false },
STR_OBJECT_SELECTION_PARK_ENTRANCE, { STR_OBJECT_SELECTION_PARK_ENTRANCE, SPR_TAB_PARK, false },
STR_OBJECT_SELECTION_WATER, { STR_OBJECT_SELECTION_WATER, SPR_TAB_WATER, false },
{ STR_OBJECT_SELECTION_SCENARIO_DESCRIPTION, SPR_TAB_STATS, false },
}; };
#pragma region Widgets #pragma region Widgets
enum WINDOW_STAFF_LIST_WIDGET_IDX { enum WINDOW_STAFF_LIST_WIDGET_IDX {
WIDX_BACKGROUND, // 0, 1 WIDX_BACKGROUND,
WIDX_TITLE, // 1, 2 WIDX_TITLE,
WIDX_CLOSE, // 2, 4 WIDX_CLOSE,
WIDX_TAB_CONTENT_PANEL, // 3, 8 WIDX_TAB_CONTENT_PANEL,
WIDX_TAB_1, // 4, 10 WIDX_ADVANCED,
WIDX_TAB_2, // 5, 20 WIDX_LIST,
WIDX_TAB_3, // 6, 40 WIDX_PREVIEW,
WIDX_TAB_4, // 7, 80 WIDX_INSTALL_TRACK,
WIDX_TAB_5, // 8, 100 WIDX_FILTER_DROPDOWN,
WIDX_TAB_6, // 9, 200 WIDX_FILTER_STRING_BUTTON,
WIDX_TAB_7, // 10, 400 WIDX_FILTER_CLEAR_BUTTON,
WIDX_TAB_8, // 11, 800 WIDX_FILTER_RIDE_TAB_FRAME,
WIDX_TAB_9, // 12, 1000
WIDX_TAB_10, // 13, 2000
WIDX_ADVANCED, // 14, 4000
WIDX_LIST, // 15, 8000
WIDX_PREVIEW, // 16, 10000
WIDX_INSTALL_TRACK, // 17, 20000
WIDX_FILTER_DROPDOWN, // 18, 40000
WIDX_FILTER_STRING_BUTTON, // 19, 80000
WIDX_FILTER_CLEAR_BUTTON, // 20, 100000
WIDX_FILTER_RIDE_TAB_FRAME, // 21, 200000
WIDX_FILTER_RIDE_TAB_ALL, WIDX_FILTER_RIDE_TAB_ALL,
WIDX_FILTER_RIDE_TAB_TRANSPORT, WIDX_FILTER_RIDE_TAB_TRANSPORT,
WIDX_FILTER_RIDE_TAB_GENTLE, WIDX_FILTER_RIDE_TAB_GENTLE,
@ -146,25 +130,17 @@ enum WINDOW_STAFF_LIST_WIDGET_IDX {
WIDX_FILTER_RIDE_TAB_STALL, WIDX_FILTER_RIDE_TAB_STALL,
WIDX_LIST_SORT_TYPE, WIDX_LIST_SORT_TYPE,
WIDX_LIST_SORT_RIDE, WIDX_LIST_SORT_RIDE,
WIDX_TAB_1,
}; };
validate_global_widx(WC_EDITOR_OBJECT_SELECTION, WIDX_TAB_1); validate_global_widx(WC_EDITOR_OBJECT_SELECTION, WIDX_TAB_1);
static rct_widget window_editor_object_selection_widgets[] = { static bool _window_editor_object_selection_widgets_initialised;
static std::vector<rct_widget> _window_editor_object_selection_widgets = {
{ WWT_FRAME, 0, 0, 599, 0, 399, 0xFFFFFFFF, STR_NONE }, { WWT_FRAME, 0, 0, 599, 0, 399, 0xFFFFFFFF, STR_NONE },
{ WWT_CAPTION, 0, 1, 598, 1, 14, STR_OBJECT_SELECTION, STR_WINDOW_TITLE_TIP }, { WWT_CAPTION, 0, 1, 598, 1, 14, STR_OBJECT_SELECTION, STR_WINDOW_TITLE_TIP },
{ WWT_CLOSEBOX, 0, 587, 597, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, { WWT_CLOSEBOX, 0, 587, 597, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
{ WWT_RESIZE, 1, 0, 599, 43, 399, 0xFFFFFFFF, STR_NONE }, { WWT_RESIZE, 1, 0, 599, 43, 399, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 96, 126, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 127, 157, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 158, 188, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 189, 219, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 220, 250, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 251, 281, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_TAB, 1, 282, 312, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
{ WWT_BUTTON, 0, 470, 591, 23, 34, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP }, { WWT_BUTTON, 0, 470, 591, 23, 34, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP },
{ WWT_SCROLL, 1, 4, 291, 60, 386, SCROLL_VERTICAL, STR_NONE }, { WWT_SCROLL, 1, 4, 291, 60, 386, SCROLL_VERTICAL, STR_NONE },
{ WWT_FLATBTN, 1, 391, 504, 46, 159, 0xFFFFFFFF, STR_NONE }, { WWT_FLATBTN, 1, 391, 504, 46, 159, 0xFFFFFFFF, STR_NONE },
@ -182,6 +158,10 @@ static rct_widget window_editor_object_selection_widgets[] = {
{ WWT_TAB, 1, 189, 219, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOPS_STALLS_TIP }, { WWT_TAB, 1, 189, 219, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOPS_STALLS_TIP },
{ WWT_TABLE_HEADER, 1, 4, 204, 80, 93, STR_NONE, STR_NONE }, { WWT_TABLE_HEADER, 1, 4, 204, 80, 93, STR_NONE, STR_NONE },
{ WWT_TABLE_HEADER, 1, 205, 291, 80, 93, STR_NONE, STR_NONE }, { WWT_TABLE_HEADER, 1, 205, 291, 80, 93, STR_NONE, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
// Copied object type times...
{ WIDGETS_END } { WIDGETS_END }
}; };
@ -252,6 +232,7 @@ static bool filter_chunks(const ObjectRepositoryItem * item);
static void filter_update_counts(); static void filter_update_counts();
static std::string object_get_description(const void * object); static std::string object_get_description(const void * object);
static sint32 get_selected_object_type(rct_window * w);
enum { enum {
RIDE_SORT_TYPE, RIDE_SORT_TYPE,
@ -296,8 +277,8 @@ static void visible_list_dispose()
static bool visible_list_sort_ride_name(const list_item &a, const list_item &b) static bool visible_list_sort_ride_name(const list_item &a, const list_item &b)
{ {
auto nameA = a.repositoryItem->Name; auto nameA = a.repositoryItem->Name.c_str();
auto nameB = b.repositoryItem->Name; auto nameB = b.repositoryItem->Name.c_str();
return strcmp(nameA, nameB) < 0; return strcmp(nameA, nameB) < 0;
} }
@ -323,7 +304,7 @@ static void visible_list_refresh(rct_window *w)
uint8 selectionFlags = _objectSelectionFlags[i]; uint8 selectionFlags = _objectSelectionFlags[i];
const ObjectRepositoryItem * item = &items[i]; const ObjectRepositoryItem * item = &items[i];
uint8 objectType = item->ObjectEntry.flags & 0x0F; uint8 objectType = item->ObjectEntry.flags & 0x0F;
if (objectType == w->selected_tab && !(selectionFlags & OBJECT_SELECTION_FLAG_6) && if (objectType == get_selected_object_type(w) && !(selectionFlags & OBJECT_SELECTION_FLAG_6) &&
filter_source(item) && filter_source(item) &&
filter_string(item) && filter_string(item) &&
filter_chunks(item) && filter_chunks(item) &&
@ -374,15 +355,29 @@ static void visible_list_refresh(rct_window *w)
window_invalidate(w); window_invalidate(w);
} }
static void window_editor_object_selection_init_widgets()
{
auto &widgets = _window_editor_object_selection_widgets;
if (!_window_editor_object_selection_widgets_initialised)
{
_window_editor_object_selection_widgets_initialised = true;
auto tabWidget = widgets[widgets.size() - 2];
for (sint32 i = 1; i < OBJECT_TYPE_COUNT; i++)
{
widgets.insert(widgets.end() - 1, tabWidget);
}
}
}
/** /**
* *
* rct2: 0x006AA64E * rct2: 0x006AA64E
*/ */
rct_window * window_editor_object_selection_open() rct_window * window_editor_object_selection_open()
{ {
rct_window* window; window_editor_object_selection_init_widgets();
window = window_bring_to_front_by_class(WC_EDITOR_OBJECT_SELECTION); auto window = window_bring_to_front_by_class(WC_EDITOR_OBJECT_SELECTION);
if (window != nullptr) if (window != nullptr)
return window; return window;
@ -396,8 +391,8 @@ rct_window * window_editor_object_selection_open()
WC_EDITOR_OBJECT_SELECTION, WC_EDITOR_OBJECT_SELECTION,
WF_10 | WF_RESIZABLE WF_10 | WF_RESIZABLE
); );
window_editor_object_selection_widgets[WIDX_FILTER_STRING_BUTTON].string = _filter_string; window->widgets = _window_editor_object_selection_widgets.data();
window->widgets = window_editor_object_selection_widgets; window->widgets[WIDX_FILTER_STRING_BUTTON].string = _filter_string;
window->enabled_widgets = window->enabled_widgets =
(1 << WIDX_ADVANCED) | (1 << WIDX_ADVANCED) |
@ -412,8 +407,10 @@ rct_window * window_editor_object_selection_open()
_filter_flags = gConfigInterface.object_selection_filter_flags; _filter_flags = gConfigInterface.object_selection_filter_flags;
memset(_filter_string, 0, sizeof(_filter_string)); memset(_filter_string, 0, sizeof(_filter_string));
for (sint32 i = WIDX_TAB_1; i <= WIDX_TAB_10; i++) for (sint32 i = WIDX_TAB_1; i < WIDX_TAB_1 + OBJECT_TYPE_COUNT; i++)
{
window->enabled_widgets |= (1LL << i); window->enabled_widgets |= (1LL << i);
}
window_init_scroll_widgets(window); window_init_scroll_widgets(window);
window->var_4AE = 0; window->var_4AE = 0;
@ -482,19 +479,6 @@ static void window_editor_object_selection_mouseup(rct_window *w, rct_widgetinde
window_close(w); window_close(w);
} }
break; break;
case WIDX_TAB_1:
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
case WIDX_TAB_5:
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
window_editor_object_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_FILTER_RIDE_TAB_ALL: case WIDX_FILTER_RIDE_TAB_ALL:
_filter_flags |= FILTER_RIDES; _filter_flags |= FILTER_RIDES;
gConfigInterface.object_selection_filter_flags = _filter_flags; gConfigInterface.object_selection_filter_flags = _filter_flags;
@ -575,6 +559,12 @@ static void window_editor_object_selection_mouseup(rct_window *w, rct_widgetinde
} }
visible_list_refresh(w); visible_list_refresh(w);
break; break;
default:
if (widgetIndex >= WIDX_TAB_1 && widgetIndex < WIDX_TAB_1 + OBJECT_TYPE_COUNT)
{
window_editor_object_set_page(w, widgetIndex - WIDX_TAB_1);
}
break;
} }
} }
@ -695,7 +685,7 @@ static void window_editor_object_selection_scroll_mousedown(rct_window *w, sint3
// when windows attempt to draw objects that don't exist any more // when windows attempt to draw objects that don't exist any more
window_close_all_except_class(WC_EDITOR_OBJECT_SELECTION); window_close_all_except_class(WC_EDITOR_OBJECT_SELECTION);
sint32 selected_object = get_object_from_object_selection((w->selected_tab & 0xFF), y); sint32 selected_object = get_object_from_object_selection(get_selected_object_type(w), y);
if (selected_object == -1) if (selected_object == -1)
return; return;
@ -755,7 +745,7 @@ static void window_editor_object_selection_scroll_mousedown(rct_window *w, sint3
*/ */
static void window_editor_object_selection_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) static void window_editor_object_selection_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y)
{ {
sint32 selectedObject = get_object_from_object_selection(w->selected_tab & 0xFF, y); sint32 selectedObject = get_object_from_object_selection(get_selected_object_type(w), y);
if (selectedObject != -1) { if (selectedObject != -1) {
list_item * listItem = &_listItems[selectedObject]; list_item * listItem = &_listItems[selectedObject];
uint8 objectSelectionFlags = *listItem->flags; uint8 objectSelectionFlags = *listItem->flags;
@ -787,22 +777,13 @@ static void window_editor_object_selection_scroll_mouseover(rct_window *w, sint3
*/ */
static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId) static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{ {
switch (widgetIndex) { if (widgetIndex >= WIDX_TAB_1 && widgetIndex < WIDX_TAB_1 + OBJECT_TYPE_COUNT)
case WIDX_TAB_1: {
case WIDX_TAB_2: set_format_arg(0, rct_string_id, ObjectSelectionPages[(widgetIndex - WIDX_TAB_1)].Caption);
case WIDX_TAB_3: }
case WIDX_TAB_4: else
case WIDX_TAB_5: {
case WIDX_TAB_6:
case WIDX_TAB_7:
case WIDX_TAB_8:
case WIDX_TAB_9:
case WIDX_TAB_10:
set_format_arg(0, rct_string_id, ObjectSelectionPageNames[(widgetIndex - WIDX_TAB_1)]);
break;
default:
set_format_arg(0, rct_string_id, STR_LIST); set_format_arg(0, rct_string_id, STR_LIST);
break;
} }
} }
@ -840,7 +821,7 @@ static void window_editor_object_selection_invalidate(rct_window *w)
w->pressed_widgets &= ~(1 << WIDX_ADVANCED); w->pressed_widgets &= ~(1 << WIDX_ADVANCED);
// Set window title and buttons // Set window title and buttons
set_format_arg(0, rct_string_id, ObjectSelectionPageNames[w->selected_tab]); set_format_arg(0, rct_string_id, ObjectSelectionPages[get_selected_object_type(w)].Caption);
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) { if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) {
w->widgets[WIDX_TITLE].text = STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE; w->widgets[WIDX_TITLE].text = STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE;
w->widgets[WIDX_INSTALL_TRACK].type = WWT_BUTTON; w->widgets[WIDX_INSTALL_TRACK].type = WWT_BUTTON;
@ -853,13 +834,18 @@ static void window_editor_object_selection_invalidate(rct_window *w)
} }
// Align tabs, hide advanced ones // Align tabs, hide advanced ones
bool advancedMode = (w->list_information_type & 1) != 0;
sint32 x = 3; sint32 x = 3;
for (sint32 i = 0; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) { for (sint32 i = 0; i < OBJECT_TYPE_COUNT; i++)
rct_widget *widget = &w->widgets[WIDX_TAB_1 + i]; {
auto widget = &w->widgets[WIDX_TAB_1 + i];
if (!(w->list_information_type & 1) && ((1 << i) & 0x5E)) { if ((!advancedMode && ObjectSelectionPages[i].IsAdvanced) ||
i == OBJECT_TYPE_SCENARIO_TEXT)
{
widget->type = WWT_EMPTY; widget->type = WWT_EMPTY;
} else { }
else
{
widget->type = WWT_TAB; widget->type = WWT_TAB;
widget->left = x; widget->left = x;
widget->right = x + 30; widget->right = x + 30;
@ -869,8 +855,10 @@ static void window_editor_object_selection_invalidate(rct_window *w)
if (gScreenFlags & (SCREEN_FLAGS_TRACK_MANAGER | SCREEN_FLAGS_TRACK_DESIGNER)) { if (gScreenFlags & (SCREEN_FLAGS_TRACK_MANAGER | SCREEN_FLAGS_TRACK_DESIGNER)) {
w->widgets[WIDX_ADVANCED].type = WWT_EMPTY; w->widgets[WIDX_ADVANCED].type = WWT_EMPTY;
for (sint32 i = 1; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) for (sint32 i = 1; i < OBJECT_TYPE_COUNT; i++)
{
w->widgets[WIDX_TAB_1 + i].type = WWT_EMPTY; w->widgets[WIDX_TAB_1 + i].type = WWT_EMPTY;
}
x = 150; x = 150;
} else { } else {
w->widgets[WIDX_ADVANCED].type = WWT_BUTTON; w->widgets[WIDX_ADVANCED].type = WWT_BUTTON;
@ -883,7 +871,7 @@ static void window_editor_object_selection_invalidate(rct_window *w)
w->widgets[WIDX_PREVIEW].right = w->widgets[WIDX_PREVIEW].left + 113; w->widgets[WIDX_PREVIEW].right = w->widgets[WIDX_PREVIEW].left + 113;
w->widgets[WIDX_FILTER_RIDE_TAB_FRAME].right = w->widgets[WIDX_LIST].right; w->widgets[WIDX_FILTER_RIDE_TAB_FRAME].right = w->widgets[WIDX_LIST].right;
bool ridePage = (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS); bool ridePage = (get_selected_object_type(w) == OBJECT_TYPE_RIDE);
w->widgets[WIDX_LIST].top = (ridePage ? 118 : 60); w->widgets[WIDX_LIST].top = (ridePage ? 118 : 60);
w->widgets[WIDX_FILTER_STRING_BUTTON].right = w->widgets[WIDX_LIST].right - 77; w->widgets[WIDX_FILTER_STRING_BUTTON].right = w->widgets[WIDX_LIST].right - 77;
w->widgets[WIDX_FILTER_STRING_BUTTON].top = (ridePage ? 80 : 46); w->widgets[WIDX_FILTER_STRING_BUTTON].top = (ridePage ? 80 : 46);
@ -942,28 +930,19 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
rct_object_entry *highlightedEntry; rct_object_entry *highlightedEntry;
rct_string_id stringId; rct_string_id stringId;
/*if (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) {
gfx_fill_rect_inset(dpi,
w->x + w->widgets[WIDX_FILTER_RIDE_TAB_ALL].left - 1,
w->y + w->widgets[WIDX_FILTER_RIDE_TAB_ALL].bottom,
w->x + w->widgets[WIDX_FILTER_RIDE_TAB_STALL].right + 1,
w->y + w->widgets[WIDX_FILTER_RIDE_TAB_ALL].bottom + 2,
w->colours[1],
0x10
);
}*/
window_draw_widgets(w, dpi); window_draw_widgets(w, dpi);
// Draw tabs // Draw tabs
for (i = 0; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) { for (i = 0; i < OBJECT_TYPE_COUNT; i++)
{
widget = &w->widgets[WIDX_TAB_1 + i]; widget = &w->widgets[WIDX_TAB_1 + i];
if (widget->type == WWT_EMPTY) if (widget->type != WWT_EMPTY)
continue; {
auto image = ObjectSelectionPages[i].Image;
x = w->x + widget->left; x = w->x + widget->left;
y = w->y + widget->top; y = w->y + widget->top;
gfx_draw_sprite(dpi, SPR_TAB_RIDE_16 + i, x, y, 0); gfx_draw_sprite(dpi, image, x, y, 0);
}
} }
const sint32 ride_tabs[] = { SPR_TAB_RIDE_16, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_TRANSPORT_0, SPR_TAB_RIDES_GENTLE_0, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_ROLLER_COASTERS_0, SPR_TAB_RIDES_THRILL_0, SPR_TAB_RIDES_WATER_0, SPR_TAB_RIDES_SHOP_0, SPR_TAB_FINANCES_RESEARCH_0 }; const sint32 ride_tabs[] = { SPR_TAB_RIDE_16, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_TRANSPORT_0, SPR_TAB_RIDES_GENTLE_0, IMAGE_TYPE_REMAP | SPR_TAB_RIDES_ROLLER_COASTERS_0, SPR_TAB_RIDES_THRILL_0, SPR_TAB_RIDES_WATER_0, SPR_TAB_RIDES_SHOP_0, SPR_TAB_FINANCES_RESEARCH_0 };
@ -972,7 +951,8 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
}; };
// Draw ride tabs // Draw ride tabs
if (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) { if (get_selected_object_type(w) == OBJECT_TYPE_RIDE)
{
for (i = 0; i < 7; i++) { for (i = 0; i < 7; i++) {
widget = &w->widgets[WIDX_FILTER_RIDE_TAB_ALL + i]; widget = &w->widgets[WIDX_FILTER_RIDE_TAB_ALL + i];
if (widget->type == WWT_EMPTY) if (widget->type == WWT_EMPTY)
@ -1008,8 +988,8 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
x = w->x + 3; x = w->x + 3;
y = w->y + w->height - 13; y = w->y + w->height - 13;
sint32 numSelected = _numSelectedObjectsForType[w->selected_tab]; sint32 numSelected = _numSelectedObjectsForType[get_selected_object_type(w)];
sint32 totalSelectable = object_entry_group_counts[w->selected_tab]; sint32 totalSelectable = object_entry_group_counts[get_selected_object_type(w)];
if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER)
totalSelectable = 4; totalSelectable = 4;
@ -1055,7 +1035,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
y = w->y + widget->bottom + 3; y = w->y + widget->bottom + 3;
width = w->width - w->widgets[WIDX_LIST].right - 6; width = w->width - w->widgets[WIDX_LIST].right - 6;
set_format_arg(0, rct_string_id, STR_STRING); set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, listItem->repositoryItem->Name); set_format_arg(2, const char *, listItem->repositoryItem->Name.c_str());
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x, y, width); gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
// Draw description of object // Draw description of object
@ -1076,7 +1056,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14); gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14);
// //
if (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) { if (get_selected_object_type(w) == OBJECT_TYPE_RIDE) {
y = w->y + w->height - 3 - 12 - 14 - 14; y = w->y + w->height - 3 - 12 - 14 - 14;
stringId = get_ride_type_string_id(listItem->repositoryItem); stringId = get_ride_type_string_id(listItem->repositoryItem);
gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, w->x + w->width - 5, y); gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, w->x + w->width - 5, y);
@ -1087,7 +1067,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
// gfx_draw_string_right(dpi, stringId, nullptr, 2, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14); // gfx_draw_string_right(dpi, stringId, nullptr, 2, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14);
// Draw object dat name // Draw object dat name
const char *path = path_get_filename(listItem->repositoryItem->Path); const char *path = path_get_filename(listItem->repositoryItem->Path.c_str());
set_format_arg(0, rct_string_id, STR_STRING); set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, path); set_format_arg(2, const char *, path);
gfx_draw_string_right(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, w->x + w->width - 5, w->y + w->height - 3 - 12); gfx_draw_string_right(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, w->x + w->width - 5, w->y + w->height - 3 - 12);
@ -1101,7 +1081,7 @@ static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpi
{ {
sint32 x, y, colour, colour2; sint32 x, y, colour, colour2;
bool ridePage = (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS); bool ridePage = (get_selected_object_type(w) == OBJECT_TYPE_RIDE);
uint8 paletteIndex = ColourMapA[w->colours[1]].mid_light; uint8 paletteIndex = ColourMapA[w->colours[1]].mid_light;
gfx_clear(dpi, paletteIndex); gfx_clear(dpi, paletteIndex);
@ -1154,7 +1134,7 @@ static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpi
} }
// Draw text // Draw text
safe_strcpy(buffer, listItem.repositoryItem->Name, 256 - (buffer - bufferWithColour)); safe_strcpy(buffer, listItem.repositoryItem->Name.c_str(), 256 - (buffer - bufferWithColour));
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) { if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) {
while (*buffer != 0 && *buffer != 9) while (*buffer != 0 && *buffer != 9)
buffer++; buffer++;
@ -1178,7 +1158,7 @@ static void window_editor_object_set_page(rct_window *w, sint32 page)
w->scrolls[0].v_top = 0; w->scrolls[0].v_top = 0;
w->frame_no = 0; w->frame_no = 0;
if (page == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) { if (page == OBJECT_TYPE_RIDE) {
_listSortType = RIDE_SORT_TYPE; _listSortType = RIDE_SORT_TYPE;
_listSortDescending = false; _listSortDescending = false;
} else { } else {
@ -1192,9 +1172,10 @@ static void window_editor_object_set_page(rct_window *w, sint32 page)
static void window_editor_object_selection_set_pressed_tab(rct_window *w) static void window_editor_object_selection_set_pressed_tab(rct_window *w)
{ {
sint32 i; for (sint32 i = 0; i < OBJECT_TYPE_COUNT; i++)
for (i = 0; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) {
w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i));
}
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->selected_tab); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->selected_tab);
} }
@ -1336,8 +1317,7 @@ static bool filter_string(const ObjectRepositoryItem * item)
return true; return true;
// Object doesn't have a name // Object doesn't have a name
utf8 *name = item->Name; if (item->Name.empty())
if (name == nullptr || name[0] == '\0')
return false; return false;
// Get ride type // Get ride type
@ -1348,9 +1328,9 @@ static bool filter_string(const ObjectRepositoryItem * item)
char type_lower[MAX_PATH]; char type_lower[MAX_PATH];
char object_path[MAX_PATH]; char object_path[MAX_PATH];
char filter_lower[sizeof(_filter_string)]; char filter_lower[sizeof(_filter_string)];
safe_strcpy(name_lower, name, MAX_PATH); safe_strcpy(name_lower, item->Name.c_str(), MAX_PATH);
safe_strcpy(type_lower, rideTypeName, MAX_PATH); safe_strcpy(type_lower, rideTypeName, MAX_PATH);
safe_strcpy(object_path, item->Path, MAX_PATH); safe_strcpy(object_path, item->Path.c_str(), MAX_PATH);
safe_strcpy(filter_lower, _filter_string, sizeof(_filter_string)); safe_strcpy(filter_lower, _filter_string, sizeof(_filter_string));
// Make use of lowercase characters only // Make use of lowercase characters only
@ -1402,9 +1382,9 @@ static bool filter_chunks(const ObjectRepositoryItem * item)
uint8 rideType = 0; uint8 rideType = 0;
for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++) for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++)
{ {
if (item->RideType[i] != RIDE_TYPE_NULL) if (item->RideInfo.RideType[i] != RIDE_TYPE_NULL)
{ {
rideType = item->RideType[i]; rideType = item->RideInfo.RideType[i];
break; break;
} }
} }
@ -1445,12 +1425,12 @@ static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem * item)
rct_string_id result = STR_NONE; rct_string_id result = STR_NONE;
for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++) for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++)
{ {
uint8 rideType = item->RideType[i]; uint8 rideType = item->RideInfo.RideType[i];
if (rideType != RIDE_TYPE_NULL) if (rideType != RIDE_TYPE_NULL)
{ {
if (RideGroupManager::RideTypeHasRideGroups(rideType)) if (RideGroupManager::RideTypeHasRideGroups(rideType))
{ {
const RideGroup * rideGroup = RideGroupManager::RideGroupFind(rideType, item->RideGroupIndex); const RideGroup * rideGroup = RideGroupManager::RideGroupFind(rideType, item->RideInfo.RideGroupIndex);
result = rideGroup->Naming.name; result = rideGroup->Naming.name;
} }
else else
@ -1477,3 +1457,8 @@ static std::string object_get_description(const void * object)
return ""; return "";
} }
} }
static sint32 get_selected_object_type(rct_window * w)
{
return w->selected_tab;
}

17
src/openrct2/EditorObjectSelectionSession.cpp
View File

@ -61,7 +61,7 @@ static void setup_track_manager_objects()
{ {
*selectionFlags |= OBJECT_SELECTION_FLAG_6; *selectionFlags |= OBJECT_SELECTION_FLAG_6;
for (auto rideType : item->RideType) for (auto rideType : item->RideInfo.RideType)
{ {
if (rideType != RIDE_TYPE_NULL && ride_type_has_flag(rideType, RIDE_TYPE_FLAG_HAS_TRACK)) if (rideType != RIDE_TYPE_NULL && ride_type_has_flag(rideType, RIDE_TYPE_FLAG_HAS_TRACK))
{ {
@ -90,7 +90,7 @@ static void setup_track_designer_objects()
{ {
*selectionFlags |= OBJECT_SELECTION_FLAG_6; *selectionFlags |= OBJECT_SELECTION_FLAG_6;
for (uint8 rideType : item->RideType) for (uint8 rideType : item->RideInfo.RideType)
{ {
if (rideType != RIDE_TYPE_NULL) if (rideType != RIDE_TYPE_NULL)
{ {
@ -223,7 +223,7 @@ void sub_6AB211()
sint32 numObjects = (sint32)object_repository_get_items_count(); sint32 numObjects = (sint32)object_repository_get_items_count();
_objectSelectionFlags = std::vector<uint8>(numObjects); _objectSelectionFlags = std::vector<uint8>(numObjects);
for (uint8 objectType = 0; objectType < 11; objectType++) { for (uint8 objectType = 0; objectType < OBJECT_TYPE_COUNT; objectType++) {
_numSelectedObjectsForType[objectType] = 0; _numSelectedObjectsForType[objectType] = 0;
_numAvailableObjectsForType[objectType] = 0; _numAvailableObjectsForType[objectType] = 0;
} }
@ -420,8 +420,9 @@ sint32 window_editor_object_selection_select_object(uint8 bh, sint32 flags, cons
uint8 objectType = object_entry_get_type(&item->ObjectEntry); uint8 objectType = object_entry_get_type(&item->ObjectEntry);
if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & (1 << 2))) { if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & (1 << 2))) {
for (sint32 j = 0; j < item->NumThemeObjects; j++) { for (const auto& sgEntry : item->SceneryGroupInfo.Entries)
window_editor_object_selection_select_object(++bh, flags, &item->ThemeObjects[j]); {
window_editor_object_selection_select_object(++bh, flags, &sgEntry);
} }
} }
@ -450,8 +451,10 @@ sint32 window_editor_object_selection_select_object(uint8 bh, sint32 flags, cons
} }
if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & (1 << 2))) { if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & (1 << 2))) {
for (uint16 j = 0; j < item->NumThemeObjects; j++) { for (const auto& sgEntry : item->SceneryGroupInfo.Entries)
if (!window_editor_object_selection_select_object(++bh, flags, &item->ThemeObjects[j])) { {
if (!window_editor_object_selection_select_object(++bh, flags, &sgEntry))
{
_maxObjectsWasHit = true; _maxObjectsWasHit = true;
} }
} }

2
src/openrct2/interface/Window.h
View File

@ -462,7 +462,7 @@ enum {
#define WC_TRACK_DESIGN_PLACE__WIDX_ROTATE 3 #define WC_TRACK_DESIGN_PLACE__WIDX_ROTATE 3
#define WC_MAP__WIDX_LAND_TOOL 13 #define WC_MAP__WIDX_LAND_TOOL 13
#define WC_MAP__WIDX_ROTATE_90 20 #define WC_MAP__WIDX_ROTATE_90 20
#define WC_EDITOR_OBJECT_SELECTION__WIDX_TAB_1 4 #define WC_EDITOR_OBJECT_SELECTION__WIDX_TAB_1 21
#define WC_CLEAR_SCENERY__WIDX_PREVIEW 3 #define WC_CLEAR_SCENERY__WIDX_PREVIEW 3
#define WC_LAND_RIGHTS__WIDX_PREVIEW 3 #define WC_LAND_RIGHTS__WIDX_PREVIEW 3
#define WC_STAFF__WIDX_PICKUP 10 #define WC_STAFF__WIDX_PICKUP 10

24
src/openrct2/object/ObjectJsonHelpers.cpp
View File

@ -306,6 +306,30 @@ namespace ObjectJsonHelpers
} }
} }
} }
else if (String::StartsWith(s, "$G1"))
{
auto range = ParseRange(s.substr(3));
if (range.size() > 0)
{
for (auto i : range)
{
auto og1 = gfx_get_g1_element(i);
if (og1 == nullptr)
{
rct_g1_element g1{};
result.push_back(g1);
}
else
{
auto length = g1_calculate_data_size(og1);
auto g1 = *og1;
g1.offset = (uint8 *)std::malloc(length);
std::memcpy(g1.offset, og1->offset, length);
result.push_back(g1);
}
}
}
}
else if (String::StartsWith(s, "$RCT2:OBJDATA/")) else if (String::StartsWith(s, "$RCT2:OBJDATA/"))
{ {
auto name = s.substr(14); auto name = s.substr(14);

50
src/openrct2/object/ObjectManager.cpp
View File

@ -58,13 +58,6 @@ public:
Object * GetLoadedObject(size_t index) override Object * GetLoadedObject(size_t index) override
{ {
if (index >= OBJECT_ENTRY_COUNT)
{
#ifdef DEBUG
log_warning("Object index %u exceeds maximum of %d.", index, OBJECT_ENTRY_COUNT);
#endif
return nullptr;
}
if (index >= _loadedObjects.size()) if (index >= _loadedObjects.size())
{ {
return nullptr; return nullptr;
@ -82,11 +75,7 @@ public:
return nullptr; return nullptr;
} }
size_t objectIndex = index; auto objectIndex = GetIndexFromTypeEntry(objectType, index);
for (sint32 i = 0; i < objectType; i++)
{
objectIndex += object_entry_group_counts[i];
}
return GetLoadedObject(objectIndex); return GetLoadedObject(objectIndex);
} }
@ -121,7 +110,7 @@ public:
loadedObject = ori->LoadedObject; loadedObject = ori->LoadedObject;
if (loadedObject == nullptr) if (loadedObject == nullptr)
{ {
uint8 objectType = object_entry_get_type(entry); uint8 objectType = object_entry_get_type(&ori->ObjectEntry);
sint32 slot = FindSpareSlot(objectType); sint32 slot = FindSpareSlot(objectType);
if (slot != -1) if (slot != -1)
{ {
@ -164,6 +153,7 @@ public:
else else
{ {
SetNewLoadedObjectList(std::get<1>(loadedObjects)); SetNewLoadedObjectList(std::get<1>(loadedObjects));
LoadDefaultObjects();
UpdateSceneryGroupIndexes(); UpdateSceneryGroupIndexes();
ResetTypeToRideEntryIndexMap(); ResetTypeToRideEntryIndexMap();
log_verbose("%u / %u new objects loaded", numNewLoadedObjects, requiredObjects.size()); log_verbose("%u / %u new objects loaded", numNewLoadedObjects, requiredObjects.size());
@ -241,6 +231,12 @@ public:
return objects; return objects;
} }
void LoadDefaultObjects() override
{
// We currently will load new object types here that apply to all
// loaded RCT1 and RCT2 save files.
}
static rct_string_id GetObjectSourceGameString(const rct_object_entry * entry) static rct_string_id GetObjectSourceGameString(const rct_object_entry * entry)
{ {
switch (object_entry_get_source_game(entry)) switch (object_entry_get_source_game(entry))
@ -265,15 +261,27 @@ public:
} }
private: private:
Object * LoadObject(const std::string &name)
{
rct_object_entry entry{};
std::copy_n(name.c_str(), 8, entry.name);
return LoadObject(&entry);
}
sint32 FindSpareSlot(uint8 objectType) sint32 FindSpareSlot(uint8 objectType)
{ {
sint32 firstIndex = GetIndexFromTypeEntry(objectType, 0); size_t firstIndex = GetIndexFromTypeEntry(objectType, 0);
sint32 endIndex = firstIndex + object_entry_group_counts[objectType]; size_t endIndex = firstIndex + object_entry_group_counts[objectType];
for (sint32 i = firstIndex; i < endIndex; i++) for (size_t i = firstIndex; i < endIndex; i++)
{ {
if (_loadedObjects.size() > (size_t)i && _loadedObjects[i] == nullptr) if (_loadedObjects.size() <= i)
{ {
return i; _loadedObjects.resize(i + 1);
return (sint32)i;
}
else if (_loadedObjects[i] == nullptr)
{
return (sint32)i;
} }
} }
return -1; return -1;
@ -565,14 +573,14 @@ private:
Console::Error::WriteLine("[%s] Object could not be loaded.", objName); Console::Error::WriteLine("[%s] Object could not be loaded.", objName);
} }
static sint32 GetIndexFromTypeEntry(uint8 objectType, uint8 entryIndex) static sint32 GetIndexFromTypeEntry(sint32 objectType, size_t entryIndex)
{ {
sint32 result = 0; sint32 result = 0;
for (uint8 i = 0; i < objectType; i++) for (sint32 i = 0; i < objectType; i++)
{ {
result += object_entry_group_counts[i]; result += object_entry_group_counts[i];
} }
result += entryIndex; result += (sint32)entryIndex;
return result; return result;
} }
}; };

1
src/openrct2/object/ObjectManager.h
View File

@ -36,6 +36,7 @@ interface IObjectManager
virtual Object * LoadObject(const rct_object_entry * entry) abstract; virtual Object * LoadObject(const rct_object_entry * entry) abstract;
virtual bool LoadObjects(const rct_object_entry * entries, size_t count) abstract; virtual bool LoadObjects(const rct_object_entry * entries, size_t count) abstract;
virtual void LoadDefaultObjects() abstract;
virtual void UnloadObjects(const rct_object_entry * entries, size_t count) abstract; virtual void UnloadObjects(const rct_object_entry * entries, size_t count) abstract;
virtual void UnloadAll() abstract; virtual void UnloadAll() abstract;

68
src/openrct2/object/ObjectRepository.cpp
View File

@ -121,8 +121,8 @@ public:
{ {
ObjectRepositoryItem item = { 0 }; ObjectRepositoryItem item = { 0 };
item.ObjectEntry = *object->GetObjectEntry(); item.ObjectEntry = *object->GetObjectEntry();
item.Path = String::Duplicate(path); item.Path = path;
item.Name = String::Duplicate(object->GetName()); item.Name = object->GetName();
object->SetRepositoryItem(&item); object->SetRepositoryItem(&item);
delete object; delete object;
return std::make_tuple(true, item); return std::make_tuple(true, item);
@ -139,22 +139,22 @@ protected:
switch (object_entry_get_type(&item.ObjectEntry)) { switch (object_entry_get_type(&item.ObjectEntry)) {
case OBJECT_TYPE_RIDE: case OBJECT_TYPE_RIDE:
stream->WriteValue<uint8>(item.RideFlags); stream->WriteValue<uint8>(item.RideInfo.RideFlags);
for (sint32 i = 0; i < MAX_CATEGORIES_PER_RIDE; i++) for (sint32 i = 0; i < MAX_CATEGORIES_PER_RIDE; i++)
{ {
stream->WriteValue<uint8>(item.RideCategory[i]); stream->WriteValue<uint8>(item.RideInfo.RideCategory[i]);
} }
for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++) for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++)
{ {
stream->WriteValue<uint8>(item.RideType[i]); stream->WriteValue<uint8>(item.RideInfo.RideType[i]);
} }
stream->WriteValue<uint8>(item.RideGroupIndex); stream->WriteValue<uint8>(item.RideInfo.RideGroupIndex);
break; break;
case OBJECT_TYPE_SCENERY_GROUP: case OBJECT_TYPE_SCENERY_GROUP:
stream->WriteValue<uint16>(item.NumThemeObjects); stream->WriteValue<uint16>((uint16)item.SceneryGroupInfo.Entries.size());
for (uint16 i = 0; i < item.NumThemeObjects; i++) for (const auto& entry : item.SceneryGroupInfo.Entries)
{ {
stream->WriteValue<rct_object_entry>(item.ThemeObjects[i]); stream->WriteValue<rct_object_entry>(entry);
} }
break; break;
} }
@ -162,7 +162,7 @@ protected:
ObjectRepositoryItem Deserialise(IStream * stream) const override ObjectRepositoryItem Deserialise(IStream * stream) const override
{ {
ObjectRepositoryItem item = { 0 }; ObjectRepositoryItem item;
item.ObjectEntry = stream->ReadValue<rct_object_entry>(); item.ObjectEntry = stream->ReadValue<rct_object_entry>();
item.Path = stream->ReadString(); item.Path = stream->ReadString();
@ -170,25 +170,27 @@ protected:
switch (object_entry_get_type(&item.ObjectEntry)) { switch (object_entry_get_type(&item.ObjectEntry)) {
case OBJECT_TYPE_RIDE: case OBJECT_TYPE_RIDE:
item.RideFlags = stream->ReadValue<uint8>(); item.RideInfo.RideFlags = stream->ReadValue<uint8>();
for (sint32 i = 0; i < 2; i++) for (sint32 i = 0; i < MAX_CATEGORIES_PER_RIDE; i++)
{ {
item.RideCategory[i] = stream->ReadValue<uint8>(); item.RideInfo.RideCategory[i] = stream->ReadValue<uint8>();
} }
for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++) for (sint32 i = 0; i < MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++)
{ {
item.RideType[i] = stream->ReadValue<uint8>(); item.RideInfo.RideType[i] = stream->ReadValue<uint8>();
} }
item.RideGroupIndex = stream->ReadValue<uint8>(); item.RideInfo.RideGroupIndex = stream->ReadValue<uint8>();
break; break;
case OBJECT_TYPE_SCENERY_GROUP: case OBJECT_TYPE_SCENERY_GROUP:
item.NumThemeObjects = stream->ReadValue<uint16>();
item.ThemeObjects = Memory::AllocateArray<rct_object_entry>(item.NumThemeObjects);
for (uint16 i = 0; i < item.NumThemeObjects; i++)
{ {
item.ThemeObjects[i] = stream->ReadValue<rct_object_entry>(); auto numEntries = stream->ReadValue<uint16>();
item.SceneryGroupInfo.Entries = std::vector<rct_object_entry>(numEntries);
for (size_t i = 0; i < numEntries; i++)
{
item.SceneryGroupInfo.Entries[i] = stream->ReadValue<rct_object_entry>();
}
break;
} }
break;
} }
return item; return item;
} }
@ -286,7 +288,7 @@ public:
} }
else else
{ {
return ObjectFactory::CreateObjectFromLegacyFile(*this, ori->Path); return ObjectFactory::CreateObjectFromLegacyFile(*this, ori->Path.c_str());
} }
} }
@ -376,10 +378,6 @@ public:
private: private:
void ClearItems() void ClearItems()
{ {
for (auto &item : _items)
{
FreeItem(&item);
}
_items.clear(); _items.clear();
_itemMap.clear(); _itemMap.clear();
} }
@ -437,8 +435,8 @@ private:
} }
else else
{ {
Console::Error::WriteLine("Object conflict: '%s'", conflict->Path); Console::Error::WriteLine("Object conflict: '%s'", conflict->Path.c_str());
Console::Error::WriteLine(" : '%s'", item.Path); Console::Error::WriteLine(" : '%s'", item.Path.c_str());
return false; return false;
} }
} }
@ -454,22 +452,6 @@ private:
} }
} }
static void FreeItem(ObjectRepositoryItem * item)
{
Memory::Free(item->Path);
Memory::Free(item->Name);
item->Path = nullptr;
item->Name = nullptr;
uint8 objectType = object_entry_get_type(&item->ObjectEntry);
switch (objectType) {
case OBJECT_TYPE_SCENERY_GROUP:
Memory::Free(item->ThemeObjects);
item->ThemeObjects = nullptr;
break;
}
}
static void SaveObject(const utf8 * path, static void SaveObject(const utf8 * path,
const rct_object_entry * entry, const rct_object_entry * entry,
const void * data, size_t dataSize, const void * data, size_t dataSize,

30
src/openrct2/object/ObjectRepository.h
View File

@ -40,24 +40,20 @@ struct ObjectRepositoryItem
{ {
size_t Id; size_t Id;
rct_object_entry ObjectEntry; rct_object_entry ObjectEntry;
utf8 * Path; std::string Path;
utf8 * Name; std::string Name;
Object * LoadedObject; Object * LoadedObject{};
union struct
{ {
struct uint8 RideFlags;
{ uint8 RideCategory[MAX_CATEGORIES_PER_RIDE];
uint8 RideFlags; uint8 RideType[MAX_RIDE_TYPES_PER_RIDE_ENTRY];
uint8 RideCategory[2]; uint8 RideGroupIndex;
uint8 RideType[MAX_RIDE_TYPES_PER_RIDE_ENTRY]; } RideInfo;
uint8 RideGroupIndex; struct
}; {
struct std::vector<rct_object_entry> Entries;
{ } SceneryGroupInfo;
uint16 NumThemeObjects;
rct_object_entry * ThemeObjects;
};
};
}; };
interface IObjectRepository interface IObjectRepository

8
src/openrct2/object/RideObject.cpp
View File

@ -372,15 +372,15 @@ void RideObject::SetRepositoryItem(ObjectRepositoryItem * item) const
{ {
for (sint32 i = 0; i < RCT2_MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++) for (sint32 i = 0; i < RCT2_MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++)
{ {
item->RideType[i] = _legacyType.ride_type[i]; item->RideInfo.RideType[i] = _legacyType.ride_type[i];
} }
for (sint32 i = 0; i < RCT2_MAX_CATEGORIES_PER_RIDE; i++) for (sint32 i = 0; i < RCT2_MAX_CATEGORIES_PER_RIDE; i++)
{ {
item->RideCategory[i] = _legacyType.category[i]; item->RideInfo.RideCategory[i] = _legacyType.category[i];
} }
uint8 flags = 0; uint8 flags = 0;
item->RideFlags = flags; item->RideInfo.RideFlags = flags;
// Find the first non-null ride type, to be used when checking the ride group // Find the first non-null ride type, to be used when checking the ride group
uint8 rideTypeIdx = ride_entry_get_first_non_null_ride_type(&_legacyType); uint8 rideTypeIdx = ride_entry_get_first_non_null_ride_type(&_legacyType);
@ -408,7 +408,7 @@ void RideObject::SetRepositoryItem(ObjectRepositoryItem * item) const
} }
} }
item->RideGroupIndex = rideGroupIndex; item->RideInfo.RideGroupIndex = rideGroupIndex;
} }
void RideObject::ReadLegacyVehicle(IReadObjectContext * context, IStream * stream, rct_ride_entry_vehicle * vehicle) void RideObject::ReadLegacyVehicle(IReadObjectContext * context, IStream * stream, rct_ride_entry_vehicle * vehicle)

9
src/openrct2/object/SceneryGroupObject.cpp
View File

@ -107,14 +107,7 @@ void SceneryGroupObject::UpdateEntryIndexes()
void SceneryGroupObject::SetRepositoryItem(ObjectRepositoryItem * item) const void SceneryGroupObject::SetRepositoryItem(ObjectRepositoryItem * item) const
{ {
Memory::Free(item->ThemeObjects); item->SceneryGroupInfo.Entries = _items;
item->NumThemeObjects = (uint16)_items.size();
item->ThemeObjects = Memory::AllocateArray<rct_object_entry>(_items.size());
for (size_t i = 0; i < _items.size(); i++)
{
item->ThemeObjects[i] = _items[i];
}
} }
std::vector<rct_object_entry> SceneryGroupObject::ReadItems(IStream * stream) std::vector<rct_object_entry> SceneryGroupObject::ReadItems(IStream * stream)

34
src/openrct2/paint/tile_element/Surface.cpp
View File

@ -501,6 +501,16 @@ static constexpr const tile_surface_boundary_data _tileSurfaceBoundaries[4] =
}; };
// clang-format on // clang-format on
static uint32 get_edge_image(uint8 index, uint8 type)
{
return _terrainEdgeSpriteIds[index][type];
}
static uint32 get_tunnel_image(uint8 index, uint8 type)
{
return _terrainEdgeTunnelSpriteIds[index][type];
}
static uint8 viewport_surface_paint_setup_get_relative_slope(const rct_tile_element * tileElement, sint32 rotation) static uint8 viewport_surface_paint_setup_get_relative_slope(const rct_tile_element * tileElement, sint32 rotation)
{ {
const uint8 slope = tileElement->properties.surface.slope; const uint8 slope = tileElement->properties.surface.slope;
@ -708,10 +718,10 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
if (!is_csg_loaded() && edgeStyle >= TERRAIN_EDGE_RCT2_COUNT) if (!is_csg_loaded() && edgeStyle >= TERRAIN_EDGE_RCT2_COUNT)
edgeStyle = TERRAIN_EDGE_ROCK; edgeStyle = TERRAIN_EDGE_ROCK;
uint32 base_image_id = _terrainEdgeSpriteIds[edgeStyle][0]; uint32 base_image_id = get_edge_image(edgeStyle, 0);
if (gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE) if (gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
{ {
base_image_id = _terrainEdgeSpriteIds[edgeStyle][1]; base_image_id = get_edge_image(edgeStyle, 1);
} }
if (edge == EDGE_BOTTOMRIGHT) if (edge == EDGE_BOTTOMRIGHT)
@ -799,10 +809,8 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
boundBoxLength -= 16; boundBoxLength -= 16;
} }
uint32 image_id = _terrainEdgeTunnelSpriteIds[edgeStyle][tunnelType] + (edge == EDGE_BOTTOMRIGHT ? 2 : 0); uint32 image_id = get_tunnel_image(edgeStyle, tunnelType) + (edge == EDGE_BOTTOMRIGHT ? 2 : 0);
sub_98197C( sub_98197C(session, image_id, offset.x, offset.y, tunnelBounds.x, tunnelBounds.y, boundBoxLength - 1, zOffset, 0, 0, boundBoxOffsetZ);
session, image_id, offset.x, offset.y, tunnelBounds.x, tunnelBounds.y, boundBoxLength - 1, zOffset, 0, 0,
boundBoxOffsetZ);
boundBoxOffsetZ = curHeight * 16; boundBoxOffsetZ = curHeight * 16;
boundBoxLength = _tunnelHeights[tunnelType][1] * 16; boundBoxLength = _tunnelHeights[tunnelType][1] * 16;
@ -813,10 +821,8 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
boundBoxLength -= 16; boundBoxLength -= 16;
} }
image_id = _terrainEdgeTunnelSpriteIds[edgeStyle][tunnelType] + (edge == EDGE_BOTTOMRIGHT ? 2 : 0) + 1; image_id = get_tunnel_image(edgeStyle, tunnelType) + (edge == EDGE_BOTTOMRIGHT ? 2 : 0) + 1;
sub_98197C( sub_98197C(session, image_id, offset.x, offset.y, tunnelBounds.x, tunnelBounds.y, boundBoxLength - 1, curHeight * 16, tunnelTopBoundBoxOffset.x, tunnelTopBoundBoxOffset.y, boundBoxOffsetZ);
session, image_id, offset.x, offset.y, tunnelBounds.x, tunnelBounds.y, boundBoxLength - 1, curHeight * 16,
tunnelTopBoundBoxOffset.x, tunnelTopBoundBoxOffset.y, boundBoxOffsetZ);
curHeight += _tunnelHeights[tunnelType][0]; curHeight += _tunnelHeights[tunnelType][0];
tunnelIndex++; tunnelIndex++;
@ -911,10 +917,10 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed
if (isWater) if (isWater)
{ {
base_image_id = _terrainEdgeSpriteIds[terrain][2]; // var_08 base_image_id = get_edge_image(terrain, 2); // var_08
if (gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE) if (gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
{ {
base_image_id = _terrainEdgeSpriteIds[terrain][1]; // var_04 base_image_id = get_edge_image(terrain, 1); // var_04
} }
base_image_id += (edge == EDGE_TOPLEFT ? 5 : 0); base_image_id += (edge == EDGE_TOPLEFT ? 5 : 0);
} }
@ -923,12 +929,12 @@ static void viewport_surface_draw_tile_side_top(paint_session * session, enum ed
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)) if (!(gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE))
{ {
const uint8 incline = (cl - al) + 1; const uint8 incline = (cl - al) + 1;
const uint32 image_id = _terrainEdgeSpriteIds[terrain][3] + (edge == EDGE_TOPLEFT ? 3 : 0) + incline; // var_c; const uint32 image_id = get_edge_image(terrain, 3) + (edge == EDGE_TOPLEFT ? 3 : 0) + incline; // var_c;
const sint16 y = (dl - al) * 16; const sint16 y = (dl - al) * 16;
paint_attach_to_previous_ps(session, image_id, 0, y); paint_attach_to_previous_ps(session, image_id, 0, y);
return; return;
} }
base_image_id = _terrainEdgeSpriteIds[terrain][1] + (edge == EDGE_TOPLEFT ? 5 : 0); // var_04 base_image_id = get_edge_image(terrain, 1) + (edge == EDGE_TOPLEFT ? 5 : 0); // var_04
} }
uint8 cur_height = Math::Min(ch, ah); uint8 cur_height = Math::Min(ch, ah);

3
src/openrct2/rct1/S4Importer.cpp
View File

@ -1834,6 +1834,9 @@ private:
void LoadObjects() void LoadObjects()
{ {
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager->LoadDefaultObjects();
LoadObjects(OBJECT_TYPE_RIDE, _rideEntries); LoadObjects(OBJECT_TYPE_RIDE, _rideEntries);
LoadObjects(OBJECT_TYPE_SMALL_SCENERY, _smallSceneryEntries); LoadObjects(OBJECT_TYPE_SMALL_SCENERY, _smallSceneryEntries);
LoadObjects(OBJECT_TYPE_LARGE_SCENERY, _largeSceneryEntries); LoadObjects(OBJECT_TYPE_LARGE_SCENERY, _largeSceneryEntries);

2
src/openrct2/ride/TrackDesign.cpp
View File

@ -1904,7 +1904,7 @@ static money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uin
const ObjectRepositoryItem * ori = object_repository_find_object_by_name(rideEntryObject->name); const ObjectRepositoryItem * ori = object_repository_find_object_by_name(rideEntryObject->name);
if (ori != nullptr) if (ori != nullptr)
{ {
uint8 rideGroupIndex = ori->RideGroupIndex; uint8 rideGroupIndex = ori->RideInfo.RideGroupIndex;
const RideGroup * td6RideGroup = RideGroupManager::RideGroupFind(td6->type, rideGroupIndex); const RideGroup * td6RideGroup = RideGroupManager::RideGroupFind(td6->type, rideGroupIndex);
uint8 * availableRideEntries = get_ride_entry_indices_for_ride_type(td6->type); uint8 * availableRideEntries = get_ride_entry_indices_for_ride_type(td6->type);

4
src/openrct2/ride/TrackDesignRepository.cpp
View File

@ -203,7 +203,7 @@ public:
} }
const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str()); const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str());
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideGroupIndex : 0; uint8 rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex); const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);
if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup)) if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup))
@ -268,7 +268,7 @@ public:
} }
const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str()); const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str());
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideGroupIndex : 0; uint8 rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex); const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);
if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup)) if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup))