mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 03:35:09 +01:00
Code Issues Releases Wiki Activity

Use sourceGame parameter in JSON files instead of originalId

Browse Source
This commit is contained in:
Michael Steenbeek
2018-07-03 13:46:45 +02:00
committed by Gymnasiast
parent 71bd110526
commit 2a64ec7aff
13 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -951,7 +951,6 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
{
int32_t i, x, y, width;
rct_widget* widget;
rct_object_entry* highlightedEntry;
rct_string_id stringId;
window_draw_widgets(w, dpi);
@@ -1043,8 +1042,6 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
list_item* listItem = &_listItems[w->selected_list_item];
highlightedEntry = w->object_entry;
// Draw preview
widget = &w->widgets[WIDX_PREVIEW];
{
@@ -1093,7 +1090,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
y += 12;
// Draw object source
stringId = object_manager_get_source_game_string(highlightedEntry);
stringId = object_manager_get_source_game_string(listItem->repositoryItem->Sources[0]);
gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, w->x + w->width - 5, y);
y += 12;
@@ -1434,8 +1431,8 @@ static bool filter_source(const ObjectRepositoryItem * item)
if (_FILTER_ALL)
return true;
uint8_t source = object_entry_get_source_game(&item->ObjectEntry);
uint8_t secondSource = item->Source;
uint8_t source = item->Sources[0];
uint8_t secondSource = item->Sources[1];
return sources_match(source) || (secondSource != OBJECT_SOURCE_CUSTOM && sources_match(secondSource));
}