mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix #5761: Mini coaster doesn't appear despite being selected (#6909)

Browse source
This commit is contained in:
Michael Steenbeek 2018-01-02 19:40:08 +01:00 committed by GitHub
parent d14dce2b95
commit 1bc711e266
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/changelog.txt
View file

@ -52,6 +52,7 @@
- Fix: [#5636] Pausing the game shows mute button as active.
- Fix: [#5741] Land rights indicators disappear when switching views.
- Fix: [#5788] Empty scenario names cause invisible entries in scenario list.
- Fix: [#5761] Mini coaster doesn't appear despite being selected.
- Fix: [#5838] Crash when saving very large track designs.
- Fix: [#6101] Rides remain in ride list window briefly after demolition.
- Fix: [#6114] Crash when using a non-LL CSG1.DAT.

3
src/openrct2-ui/windows/Research.cpp
View file

@ -371,7 +371,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp
// Expected
set_format_arg(0, rct_string_id, STR_RESEARCH_STAGE_UNKNOWN);
if (gResearchProgressStage != 0) {
if (gResearchProgressStage != RESEARCH_STAGE_INITIAL_RESEARCH) {
uint16 expectedDay = gResearchExpectedDay;
if (expectedDay != 255) {
// TODO: Should probably use game date format setting
@ -505,7 +505,6 @@ static void window_research_funding_invalidate(rct_window *w)
if ((gParkFlags & PARK_FLAGS_NO_MONEY) ||
(gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL)) {
//window_research_funding_widgets[WIDX_FUNDING_GROUP].type = WWT_EMPTY;
window_research_funding_widgets[WIDX_RESEARCH_FUNDING].type = WWT_EMPTY;
window_research_funding_widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON].type = WWT_EMPTY;
} else {

40
src/openrct2/Game.cpp
View file

@ -62,6 +62,7 @@
#include "world/scenery.h"
#include "world/sprite.h"
#include "world/water.h"
#include "ObjectList.h"
#define NUMBER_OF_AUTOSAVES_TO_KEEP 9
@ -1238,44 +1239,7 @@ void game_fix_save_vars()
}
}
// Fix invalid research items
for (sint32 i = 0; i < MAX_RESEARCH_ITEMS; i++)
{
rct_research_item * researchItem = &gResearchItems[i];
if (researchItem->entryIndex == RESEARCHED_ITEMS_SEPARATOR)
continue;
if (researchItem->entryIndex == RESEARCHED_ITEMS_END)
{
if (i == MAX_RESEARCH_ITEMS - 1)
{
(--researchItem)->entryIndex = RESEARCHED_ITEMS_END;
}
(++researchItem)->entryIndex = RESEARCHED_ITEMS_END_2;
break;
}
if (researchItem->entryIndex == RESEARCHED_ITEMS_END_2)
break;
if (researchItem->entryIndex & RESEARCH_ENTRY_RIDE_MASK)
{
uint8 entryIndex = researchItem->entryIndex & 0xFF;
rct_ride_entry * rideEntry = get_ride_entry(entryIndex);
if (rideEntry == nullptr)
{
research_remove(researchItem->entryIndex);
i--;
}
}
else
{
uint8 entryIndex = researchItem->entryIndex;
rct_scenery_group_entry * sceneryGroupEntry = get_scenery_group_entry(entryIndex);
if (sceneryGroupEntry == nullptr)
{
research_remove(researchItem->entryIndex);
i--;
}
}
}
research_fix();
// Fix banner list pointing to NULL map elements
banner_reset_broken_index();

78
src/openrct2/management/Research.cpp
View file

@ -362,7 +362,7 @@ void research_update()
case RESEARCH_STAGE_COMPLETING_DESIGN:
research_finish_item(gResearchNextItem);
gResearchProgress = 0;
gResearchProgressStage = 0;
gResearchProgressStage = RESEARCH_STAGE_INITIAL_RESEARCH;
research_calculate_expected_date();
research_update_uncompleted_types();
research_invalidate_related_windows();
@ -920,3 +920,79 @@ void research_remove_flags()
}
}
}
void research_fix()
{
// Fix invalid research items
for (sint32 i = 0; i < MAX_RESEARCH_ITEMS; i++)
{
rct_research_item * researchItem = &gResearchItems[i];
if (researchItem->entryIndex == RESEARCHED_ITEMS_SEPARATOR)
continue;
if (researchItem->entryIndex == RESEARCHED_ITEMS_END)
{
if (i == MAX_RESEARCH_ITEMS - 1)
{
(--researchItem)->entryIndex = RESEARCHED_ITEMS_END;
}
(++researchItem)->entryIndex = RESEARCHED_ITEMS_END_2;
break;
}
if (researchItem->entryIndex == RESEARCHED_ITEMS_END_2)
break;
if (researchItem->entryIndex & RESEARCH_ENTRY_RIDE_MASK)
{
uint8 entryIndex = researchItem->entryIndex & 0xFF;
rct_ride_entry * rideEntry = get_ride_entry(entryIndex);
if (rideEntry == nullptr)
{
research_remove(researchItem->entryIndex);
i--;
}
}
else
{
uint8 entryIndex = researchItem->entryIndex;
rct_scenery_group_entry * sceneryGroupEntry = get_scenery_group_entry(entryIndex);
if (sceneryGroupEntry == nullptr)
{
research_remove(researchItem->entryIndex);
i--;
}
}
}
research_update_uncompleted_types();
if (gResearchUncompletedCategories == 0)
gResearchProgressStage = RESEARCH_STAGE_FINISHED_ALL;
// Sometimes ride entries are not in the research table.
// If all research is done, simply insert all of them as researched.
// For good measure, also include scenery groups.
if (gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL)
{
for (uint8 i = 0; i < MAX_RIDE_OBJECTS; i++)
{
const rct_ride_entry * rideEntry = get_ride_entry(i);
if (rideEntry != nullptr)
{
research_insert_ride_entry(i, true);
ride_entry_set_invented(i);
for (uint8 j = 0; j < MAX_RIDE_TYPES_PER_RIDE_ENTRY; j++)
{
ride_type_set_invented(rideEntry->ride_type[j]);
}
}
}
for (uint8 i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++)
{
const rct_scenery_group_entry * groupEntry = get_scenery_group_entry(i);
if (groupEntry != nullptr)
research_insert_scenery_group_entry(i, true);
}
}
}

1
src/openrct2/management/Research.h
View file

@ -126,6 +126,7 @@ rct_string_id research_item_get_name(uint32 researchItem);
uint8 research_get_ride_base_type(sint32 researchItem);
rct_string_id research_get_friendly_base_ride_type_name(uint8 trackType, rct_ride_entry * rideEntry);
void research_remove_flags();
void research_fix();
#ifdef __cplusplus
}