mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix bug introduced after empty vector check
This commit is contained in:
parent
ae8c93ca2b
commit
ad96aa5785
|
@ -125,6 +125,16 @@ static void research_invalidate_related_windows()
|
||||||
window_invalidate_by_class(WC_RESEARCH);
|
window_invalidate_by_class(WC_RESEARCH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void research_mark_as_fully_completed()
|
||||||
|
{
|
||||||
|
gResearchProgress = 0;
|
||||||
|
gResearchProgressStage = RESEARCH_STAGE_FINISHED_ALL;
|
||||||
|
research_invalidate_related_windows();
|
||||||
|
// Reset funding to 0 if no more rides.
|
||||||
|
auto gameAction = ParkSetResearchFundingAction(gResearchPriorities, 0);
|
||||||
|
GameActions::Execute(&gameAction);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* rct2: 0x00684BE5
|
* rct2: 0x00684BE5
|
||||||
|
@ -133,6 +143,7 @@ static void research_next_design()
|
||||||
{
|
{
|
||||||
if (gResearchItemsUninvented.empty())
|
if (gResearchItemsUninvented.empty())
|
||||||
{
|
{
|
||||||
|
research_mark_as_fully_completed();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -153,12 +164,7 @@ static void research_next_design()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gResearchProgress = 0;
|
research_mark_as_fully_completed();
|
||||||
gResearchProgressStage = RESEARCH_STAGE_FINISHED_ALL;
|
|
||||||
research_invalidate_related_windows();
|
|
||||||
// Reset funding to 0 if no more rides.
|
|
||||||
auto gameAction = ParkSetResearchFundingAction(gResearchPriorities, 0);
|
|
||||||
GameActions::Execute(&gameAction);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue