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

Fix RCT1 research naming to match RCT2's

This commit is contained in:
Michael Steenbeek 2018-01-09 13:51:39 +01:00
parent 6a88d6e04d
commit f508402317
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/openrct2/rct1/RCT1.h
View File

@ -571,9 +571,9 @@ assert_struct_size(rct1_sprite, 0x100);
typedef struct rct1_research_item {
uint8 item;
uint8 related_ride;
uint8 category;
uint8 type;
uint8 flags;
uint8 expenditure_area;
uint8 category;
} rct1_research_item;
assert_struct_size(rct1_research_item, 5);
@ -636,13 +636,13 @@ typedef struct rct1_s4 {
uint8 research_progress;
uint8 last_research_item;
uint8 last_research_ride;
uint8 last_research_category;
uint8 last_research_flag;
uint8 last_research_type;
uint8 last_research_flags;
rct1_research_item research_items[200];
uint8 next_research_item;
uint8 next_research_ride;
uint8 next_research_category;
uint8 next_research_flag;
uint8 next_research_type;
uint8 next_research_flags;
uint16 unk_19953C;
uint32 unk_19953E;
uint16 cheat_detection_land_owned;
@ -1096,19 +1096,19 @@ enum {
};
enum {
RCT1_RESEARCH_CATEGORY_THEME,
RCT1_RESEARCH_CATEGORY_RIDE,
RCT1_RESEARCH_CATEGORY_VEHICLE,
RCT1_RESEARCH_CATEGORY_SPECIAL,
RCT1_RESEARCH_TYPE_THEME,
RCT1_RESEARCH_TYPE_RIDE,
RCT1_RESEARCH_TYPE_VEHICLE,
RCT1_RESEARCH_TYPE_SPECIAL,
};
enum {
RCT1_RESEARCH_EXPENDITURE_ROLLERCOASTERS = 1 << 0,
RCT1_RESEARCH_EXPENDITURE_THRILL_RIDES = 1 << 1,
RCT1_RESEARCH_EXPENDITURE_GENTLE_TRANSPORT_RIDES = 1 << 2,
RCT1_RESEARCH_EXPENDITURE_SHOPS = 1 << 3,
RCT1_RESEARCH_EXPENDITURE_SCENERY_THEMEING = 1 << 4,
RCT1_RESEARCH_EXPENDITURE_RIDE_IMPROVEMENTS = 1 << 5,
RCT1_RESEARCH_CATEGORY_ROLLERCOASTERS = 1 << 0,
RCT1_RESEARCH_CATEGORY_THRILL_RIDES = 1 << 1,
RCT1_RESEARCH_CATEGORY_GENTLE_TRANSPORT_RIDES = 1 << 2,
RCT1_RESEARCH_CATEGORY_SHOPS = 1 << 3,
RCT1_RESEARCH_CATEGORY_SCENERY_THEMEING = 1 << 4,
RCT1_RESEARCH_CATEGORY_RIDE_IMPROVEMENTS = 1 << 5,
};
// Unconfirmed special track elements for research

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

@ -406,11 +406,11 @@ private:
}
}
switch (researchItem->category) {
case RCT1_RESEARCH_CATEGORY_THEME:
switch (researchItem->type) {
case RCT1_RESEARCH_TYPE_THEME:
AddEntriesForSceneryTheme(researchItem->item);
break;
case RCT1_RESEARCH_CATEGORY_RIDE:
case RCT1_RESEARCH_TYPE_RIDE:
{
uint8 rideType = researchItem->item;
@ -432,7 +432,7 @@ private:
}
}
if (researchItem2->category == RCT1_RESEARCH_CATEGORY_VEHICLE &&
if (researchItem2->type == RCT1_RESEARCH_TYPE_VEHICLE &&
researchItem2->related_ride == rideType)
{
AddEntryForVehicleType(rideType, researchItem2->item);
@ -1949,8 +1949,8 @@ private:
}
}
switch (researchItem->category) {
case RCT1_RESEARCH_CATEGORY_THEME:
switch (researchItem->type) {
case RCT1_RESEARCH_TYPE_THEME:
{
uint8 rct1SceneryTheme = researchItem->item;
uint8 sceneryGroupEntryIndex = _sceneryThemeTypeToEntryMap[rct1SceneryTheme];
@ -1961,7 +1961,7 @@ private:
}
break;
}
case RCT1_RESEARCH_CATEGORY_RIDE:
case RCT1_RESEARCH_TYPE_RIDE:
{
uint8 rct1RideType = researchItem->item;
_researchRideTypeUsed[rct1RideType] = true;
@ -1978,7 +1978,7 @@ private:
continue;
}
if (researchItem2->category == RCT1_RESEARCH_CATEGORY_VEHICLE &&
if (researchItem2->type == RCT1_RESEARCH_TYPE_VEHICLE &&
researchItem2->related_ride == rct1RideType)
{
// Only add the vehicles that were listed before this ride, otherwise we might
@ -2006,7 +2006,7 @@ private:
break;
}
case RCT1_RESEARCH_CATEGORY_VEHICLE:
case RCT1_RESEARCH_TYPE_VEHICLE:
// Only add vehicle if the related ride has been seen, this to make sure that vehicles
// are researched only after the ride has been researched
if (_researchRideTypeUsed[researchItem->related_ride])
@ -2015,7 +2015,7 @@ private:
}
break;
case RCT1_RESEARCH_CATEGORY_SPECIAL:
case RCT1_RESEARCH_TYPE_SPECIAL:
// Not supported
break;
}
@ -2025,25 +2025,25 @@ private:
// Research funding / priority
uint8 activeResearchTypes = 0;
if (_s4.research_priority & RCT1_RESEARCH_EXPENDITURE_ROLLERCOASTERS)
if (_s4.research_priority & RCT1_RESEARCH_CATEGORY_ROLLERCOASTERS)
{
activeResearchTypes |= (1 << RESEARCH_CATEGORY_ROLLERCOASTER);
}
if (_s4.research_priority & RCT1_RESEARCH_EXPENDITURE_THRILL_RIDES)
if (_s4.research_priority & RCT1_RESEARCH_CATEGORY_THRILL_RIDES)
{
activeResearchTypes |= (1 << RESEARCH_CATEGORY_THRILL);
activeResearchTypes |= (1 << RESEARCH_CATEGORY_WATER);
}
if (_s4.research_priority & RCT1_RESEARCH_EXPENDITURE_GENTLE_TRANSPORT_RIDES)
if (_s4.research_priority & RCT1_RESEARCH_CATEGORY_GENTLE_TRANSPORT_RIDES)
{
activeResearchTypes |= (1 << RESEARCH_CATEGORY_GENTLE);
activeResearchTypes |= (1 << RESEARCH_CATEGORY_TRANSPORT);
}
if (_s4.research_priority & RCT1_RESEARCH_EXPENDITURE_SHOPS)
if (_s4.research_priority & RCT1_RESEARCH_CATEGORY_SHOPS)
{
activeResearchTypes |= (1 << RESEARCH_CATEGORY_SHOP);
}
if (_s4.research_priority & RCT1_RESEARCH_EXPENDITURE_SCENERY_THEMEING)
if (_s4.research_priority & RCT1_RESEARCH_CATEGORY_SCENERY_THEMEING)
{
activeResearchTypes |= (1 << RESEARCH_CATEGORY_SCENERYSET);
}
@ -2054,7 +2054,7 @@ private:
gResearchProgress = _s4.research_progress;
// gResearchProgressStage =
gResearchNextItem.rawValue = _s4.next_research_item;
gResearchNextCategory = _s4.next_research_category;
gResearchNextCategory = _s4.next_research_type;
// gResearchExpectedDay =
// gResearchExpectedMonth =