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

organise order of preset scenery groups and paths

This commit is contained in:
Ted John 2016-04-19 23:51:57 +01:00
parent ff1de46ca6
commit 6a48bed4ad
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/rct1/S4Importer.cpp
View File

@ -111,34 +111,38 @@ void S4Importer::Initialise()
void S4Importer::CreateAvailableObjectMappings() void S4Importer::CreateAvailableObjectMappings()
{ {
// Add default scenery groups AddDefaultEntries();
_sceneryGroupEntries.AddRange({
"SCGTREES",
"SCGPATHX",
"SCGSHRUB",
"SCGGARDN",
"SCGFENCE",
"SCGWALLS"
});
// Add default footpaths
_pathEntries.AddRange({
"PATHASH ",
"PATHCRZY",
"PATHDIRT",
"PATHSPCE",
"TARMAC ",
"TARMACB ",
"TARMACG ",
"ROAD ",
});
AddAvailableEntriesFromResearchList(); AddAvailableEntriesFromResearchList();
AddAvailableEntriesFromMap(); AddAvailableEntriesFromMap();
AddAvailableEntriesFromRides(); AddAvailableEntriesFromRides();
AddAvailableEntriesFromSceneryGroups(); AddAvailableEntriesFromSceneryGroups();
} }
void S4Importer::AddDefaultEntries()
{
// Add default scenery groups
_sceneryGroupEntries.AddRange({
"SCGTREES",
"SCGSHRUB",
"SCGGARDN",
"SCGFENCE",
"SCGWALLS",
"SCGPATHX",
});
// Add default footpaths
_pathEntries.AddRange({
"TARMAC ",
"TARMACG ",
"TARMACB ",
"PATHCRZY",
"PATHSPCE",
"PATHDIRT",
"PATHASH ",
"ROAD ",
});
}
void S4Importer::AddAvailableEntriesFromResearchList() void S4Importer::AddAvailableEntriesFromResearchList()
{ {
size_t researchListCount; size_t researchListCount;

1
src/rct1/S4Importer.h
View File

@ -53,6 +53,7 @@ private:
* lookup tables for converting from hard coded RCT1 object types to dynamic object entries. * lookup tables for converting from hard coded RCT1 object types to dynamic object entries.
*/ */
void CreateAvailableObjectMappings(); void CreateAvailableObjectMappings();
void AddDefaultEntries();
void AddAvailableEntriesFromResearchList(); void AddAvailableEntriesFromResearchList();
void AddAvailableEntriesFromMap(); void AddAvailableEntriesFromMap();
void AddAvailableEntriesFromRides(); void AddAvailableEntriesFromRides();