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

Fix warnings when converting RCT1 research

This commit is contained in:
Gymnasiast 2018-02-05 19:05:57 +01:00
parent 76344498bb
commit ba7548089c
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2232,29 +2232,37 @@ private:
if (srcType == RCT1_RESEARCH_TYPE_RIDE)
{
uint8 entryIndex = _rideTypeToRideEntryMap[srcItem];
rct_ride_entry * rideEntry = get_ride_entry(entryIndex);
if (entryIndex != 255 && rideEntry != nullptr)
if (entryIndex != 255)
{
dst->entryIndex = entryIndex;
dst->baseRideType = ride_entry_get_first_non_null_ride_type(rideEntry);
dst->type = RESEARCH_ENTRY_TYPE_RIDE;
dst->flags = 0;
dst->category = rideEntry->category[0];
rct_ride_entry * rideEntry = get_ride_entry(entryIndex);
if (rideEntry != nullptr)
{
dst->entryIndex = entryIndex;
dst->baseRideType = ride_entry_get_first_non_null_ride_type(rideEntry);
dst->type = RESEARCH_ENTRY_TYPE_RIDE;
dst->flags = 0;
dst->category = rideEntry->category[0];
}
}
}
else if (srcType == RCT1_RESEARCH_TYPE_VEHICLE)
{
uint8 entryIndex = _vehicleTypeToRideEntryMap[srcItem];
rct_ride_entry * rideEntry = get_ride_entry(entryIndex);
if (entryIndex != 255 && rideEntry != nullptr)
if (entryIndex != 255)
{
dst->entryIndex = entryIndex;
dst->baseRideType = ride_entry_get_first_non_null_ride_type(rideEntry);
dst->type = RESEARCH_ENTRY_TYPE_RIDE;
dst->flags = 0;
dst->category = rideEntry->category[0];
rct_ride_entry * rideEntry = get_ride_entry(entryIndex);
if (rideEntry != nullptr)
{
dst->entryIndex = entryIndex;
dst->baseRideType = ride_entry_get_first_non_null_ride_type(rideEntry);
dst->type = RESEARCH_ENTRY_TYPE_RIDE;
dst->flags = 0;
dst->category = rideEntry->category[0];
}
}
}
else if (srcType == RCT1_RESEARCH_TYPE_THEME)