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

Make always-researched research items unpickable.

Browse Source
This commit is contained in:
Chaosmeister
2018-06-04 22:39:35 +02:00
committed by Aaron van Geffen
parent ac0c1ba94a
commit 308ae4b357
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@@ -305,10 +305,17 @@ static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y(s
researchItem++;
}
for (; researchItem->rawValue != RESEARCHED_ITEMS_SEPARATOR && researchItem->rawValue != RESEARCHED_ITEMS_END; researchItem++) {
for (; researchItem->rawValue != RESEARCHED_ITEMS_SEPARATOR && researchItem->rawValue != RESEARCHED_ITEMS_END; researchItem++)
{
y -= SCROLLABLE_ROW_HEIGHT;
if (y < 0)
{
if (research_item_is_always_researched(researchItem))
{
return nullptr;
}
return researchItem;
}
}
return nullptr;
@@ -330,10 +337,17 @@ static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y_i
researchItem++;
}
for (; researchItem->rawValue != RESEARCHED_ITEMS_SEPARATOR && researchItem->rawValue != RESEARCHED_ITEMS_END; researchItem++) {
for (; researchItem->rawValue != RESEARCHED_ITEMS_SEPARATOR && researchItem->rawValue != RESEARCHED_ITEMS_END; researchItem++)
{
y -= SCROLLABLE_ROW_HEIGHT;
if (y < 0)
{
if (research_item_is_always_researched(researchItem))
{
return nullptr;
}
return researchItem;
}
}
return researchItem;