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

Formating.

This commit is contained in:
Matt 2018-08-29 09:30:36 +02:00
parent 8c6f6a18ab
commit ccf12befd5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/ParkImporter.h
View File

@ -65,8 +65,7 @@ namespace ParkImporter
{ {
std::unique_ptr<IParkImporter> Create(const std::string& hintPath); std::unique_ptr<IParkImporter> Create(const std::string& hintPath);
std::unique_ptr<IParkImporter> CreateS4(); std::unique_ptr<IParkImporter> CreateS4();
std::unique_ptr<IParkImporter> CreateS6( std::unique_ptr<IParkImporter> CreateS6(IObjectRepository& objectRepository);
IObjectRepository& objectRepository);
bool ExtensionIsRCT1(const std::string& extension); bool ExtensionIsRCT1(const std::string& extension);
bool ExtensionIsScenario(const std::string& extension); bool ExtensionIsScenario(const std::string& extension);

3
src/openrct2/rct2/S6Importer.cpp
View File

@ -843,8 +843,7 @@ public:
} }
}; };
std::unique_ptr<IParkImporter> ParkImporter::CreateS6( std::unique_ptr<IParkImporter> ParkImporter::CreateS6(IObjectRepository& objectRepository)
IObjectRepository& objectRepository)
{ {
return std::make_unique<S6Importer>(objectRepository); return std::make_unique<S6Importer>(objectRepository);
} }

2
src/openrct2/ride/Ride.cpp
View File

@ -234,7 +234,7 @@ rct_ride_entry* get_ride_entry(int32_t index)
{ {
rct_ride_entry* result = nullptr; rct_ride_entry* result = nullptr;
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_RIDE, index); auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_RIDE, index);
if (obj != nullptr) if (obj != nullptr)
{ {