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

Refactor reference over std::shared_ptr.

This commit is contained in:
Matt 2018-08-29 00:52:10 +02:00
parent ad3e3c589b
commit 04928d4b84
18 changed files with 134 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/title/TitleSequencePlayer.cpp
View File

@ -419,8 +419,8 @@ private:
auto parkImporter = ParkImporter::Create(path);
auto result = parkImporter->Load(path);
auto objectManager = GetContext()->GetObjectManager();
objectManager->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
auto& objectManager = GetContext()->GetObjectManager();
objectManager.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import();
}
@ -458,8 +458,8 @@ private:
auto parkImporter = ParkImporter::Create(hintPath);
auto result = parkImporter->LoadFromStream(stream, isScenario);
auto objectManager = GetContext()->GetObjectManager();
objectManager->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
auto& objectManager = GetContext()->GetObjectManager();
objectManager.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import();
}

4
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -367,10 +367,10 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
auto hintPath = String::ToStd(handle->HintPath);
bool isScenario = ParkImporter::ExtensionIsScenario(hintPath);
auto objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto parkImporter = std::unique_ptr<IParkImporter>(ParkImporter::Create(hintPath));
auto result = parkImporter->LoadFromStream(stream, isScenario);
objectMgr->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
objectMgr.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import();
if (isScenario)

10
src/openrct2/Context.cpp
View File

@ -170,14 +170,14 @@ namespace OpenRCT2
return *_localisationService;
}
std::shared_ptr<IObjectManager> GetObjectManager() override
IObjectManager& GetObjectManager() override
{
return _objectManager;
return *_objectManager;
}
std::shared_ptr<IObjectRepository> GetObjectRepository() override
IObjectRepository& GetObjectRepository() override
{
return _objectRepository;
return *_objectRepository;
}
ITrackDesignRepository* GetTrackDesignRepository() override
@ -496,7 +496,7 @@ namespace OpenRCT2
else
{
// Save is an S6 (RCT2 format)
parkImporter = ParkImporter::CreateS6(_objectRepository, _objectManager);
parkImporter = ParkImporter::CreateS6(*_objectRepository, *_objectManager);
}
try

4
src/openrct2/Context.h
View File

@ -98,8 +98,8 @@ namespace OpenRCT2
virtual GameState* GetGameState() abstract;
virtual std::shared_ptr<IPlatformEnvironment> GetPlatformEnvironment() abstract;
virtual Localisation::LocalisationService& GetLocalisationService() abstract;
virtual std::shared_ptr<IObjectManager> GetObjectManager() abstract;
virtual std::shared_ptr<IObjectRepository> GetObjectRepository() abstract;
virtual IObjectManager& GetObjectManager() abstract;
virtual IObjectRepository& GetObjectRepository() abstract;
virtual ITrackDesignRepository* GetTrackDesignRepository() abstract;
virtual IScenarioRepository* GetScenarioRepository() abstract;
virtual int32_t GetDrawingEngineType() abstract;

2
src/openrct2/ParkImporter.h
View File

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

4
src/openrct2/localisation/Language.cpp
View File

@ -97,10 +97,10 @@ bool language_open(int32_t id)
{
auto context = OpenRCT2::GetContext();
auto& localisationService = context->GetLocalisationService();
auto objectManager = context->GetObjectManager();
auto& objectManager = context->GetObjectManager();
try
{
localisationService.OpenLanguage(id, *objectManager);
localisationService.OpenLanguage(id, objectManager);
return true;
}
catch (const std::exception&)

22
src/openrct2/network/Network.cpp
View File

@ -1181,8 +1181,8 @@ void Network::Server_Send_MAP(NetworkConnection* connection)
// This will send all custom objects to connected clients
// TODO: fix it so custom objects negotiation is performed even in this case.
auto context = GetContext();
auto objManager = context->GetObjectManager();
objects = objManager->GetPackableObjects();
auto& objManager = context->GetObjectManager();
objects = objManager.GetPackableObjects();
}
size_t out_size;
@ -1938,8 +1938,8 @@ void Network::Server_Client_Joined(const char* name, const std::string& keyhash,
chat_history_add(text);
auto context = GetContext();
auto objManager = context->GetObjectManager();
auto objects = objManager->GetPackableObjects();
auto& objManager = context->GetObjectManager();
auto objects = objManager.GetPackableObjects();
Server_Send_OBJECTS(connection, objects);
// Log player joining event
@ -1960,7 +1960,7 @@ void Network::Server_Handle_TOKEN(NetworkConnection& connection, [[maybe_unused]
void Network::Client_Handle_OBJECTS(NetworkConnection& connection, NetworkPacket& packet)
{
auto repo = GetContext()->GetObjectRepository();
auto& repo = GetContext()->GetObjectRepository();
uint32_t size;
packet >> size;
log_verbose("client received object list, it has %u entries", size);
@ -1979,7 +1979,7 @@ void Network::Client_Handle_OBJECTS(NetworkConnection& connection, NetworkPacket
std::string s(name, name + 8);
uint32_t checksum, flags;
packet >> checksum >> flags;
const ObjectRepositoryItem* ori = repo->FindObject(s.c_str());
const ObjectRepositoryItem* ori = repo.FindObject(s.c_str());
// This could potentially request the object if checksums don't match, but since client
// won't replace its version with server-provided one, we don't do that.
if (ori == nullptr)
@ -2016,14 +2016,14 @@ void Network::Server_Handle_OBJECTS(NetworkConnection& connection, NetworkPacket
return;
}
log_verbose("Client requested %u objects", size);
auto repo = GetContext()->GetObjectRepository();
auto& repo = GetContext()->GetObjectRepository();
for (uint32_t i = 0; i < size; i++)
{
const char* name = (const char*)packet.Read(8);
// This is required, as packet does not have null terminator
std::string s(name, name + 8);
log_verbose("Client requested object %s", s.c_str());
const ObjectRepositoryItem* item = repo->FindObject(s.c_str());
const ObjectRepositoryItem* item = repo.FindObject(s.c_str());
if (item == nullptr)
{
log_warning("Client tried getting non-existent object %s from us.", s.c_str());
@ -2230,10 +2230,10 @@ bool Network::LoadMap(IStream* stream)
try
{
auto context = GetContext();
auto objManager = context->GetObjectManager();
auto importer = ParkImporter::CreateS6(context->GetObjectRepository(), context->GetObjectManager());
auto& objManager = context->GetObjectManager();
auto importer = ParkImporter::CreateS6(context->GetObjectRepository(), objManager);
auto loadResult = importer->LoadFromStream(stream, false);
objManager->LoadObjects(loadResult.RequiredObjects.data(), loadResult.RequiredObjects.size());
objManager.LoadObjects(loadResult.RequiredObjects.data(), loadResult.RequiredObjects.size());
importer->Import();
sprite_position_tween_reset();

8
src/openrct2/object/ObjectList.cpp
View File

@ -169,8 +169,8 @@ void* object_entry_get_chunk(int32_t objectType, size_t index)
}
void* result = nullptr;
auto objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objectMgr->GetLoadedObject(objectIndex);
auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objectMgr.GetLoadedObject(objectIndex);
if (obj != nullptr)
{
result = obj->GetLegacyData();
@ -181,8 +181,8 @@ void* object_entry_get_chunk(int32_t objectType, size_t index)
const rct_object_entry* object_entry_get_entry(int32_t objectType, size_t index)
{
const rct_object_entry* result = nullptr;
auto objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objectMgr->GetLoadedObject(objectType, index);
auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objectMgr.GetLoadedObject(objectType, index);
if (obj != nullptr)
{
result = obj->GetObjectEntry();

27
src/openrct2/object/ObjectManager.cpp
View File

@ -632,46 +632,43 @@ std::unique_ptr<IObjectManager> CreateObjectManager(std::shared_ptr<IObjectRepos
void* object_manager_get_loaded_object_by_index(size_t index)
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager->GetLoadedObject(index);
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.GetLoadedObject(index);
return (void*)loadedObject;
}
void* object_manager_get_loaded_object(const rct_object_entry* entry)
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager->GetLoadedObject(entry);
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.GetLoadedObject(entry);
return (void*)loadedObject;
}
uint8_t object_manager_get_loaded_object_entry_index(const void* loadedObject)
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
const Object* object = static_cast<const Object*>(loadedObject);
uint8_t entryIndex = objectManager->GetLoadedObjectEntryIndex(object);
uint8_t entryIndex = objectManager.GetLoadedObjectEntryIndex(object);
return entryIndex;
}
void* object_manager_load_object(const rct_object_entry* entry)
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager->LoadObject(entry);
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.LoadObject(entry);
return (void*)loadedObject;
}
void object_manager_unload_objects(const rct_object_entry* entries, size_t count)
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager->UnloadObjects(entries, count);
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager.UnloadObjects(entries, count);
}
void object_manager_unload_all_objects()
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
if (objectManager != nullptr)
{
objectManager->UnloadAll();
}
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager.UnloadAll();
}
rct_string_id object_manager_get_source_game_string(const uint8_t sourceGame)

34
src/openrct2/object/ObjectRepository.cpp
View File

@ -634,8 +634,8 @@ bool IsObjectCustom(const ObjectRepositoryItem* object)
const rct_object_entry* object_list_find(rct_object_entry* entry)
{
const rct_object_entry* result = nullptr;
auto objRepo = GetContext()->GetObjectRepository();
auto item = objRepo->FindObject(entry);
auto& objRepo = GetContext()->GetObjectRepository();
auto item = objRepo.FindObject(entry);
if (item != nullptr)
{
result = &item->ObjectEntry;
@ -647,21 +647,21 @@ void object_list_load()
{
auto context = GetContext();
const auto& localisationService = context->GetLocalisationService();
auto objectRepository = context->GetObjectRepository();
objectRepository->LoadOrConstruct(localisationService.GetCurrentLanguage());
auto& objectRepository = context->GetObjectRepository();
objectRepository.LoadOrConstruct(localisationService.GetCurrentLanguage());
auto objectManager = context->GetObjectManager();
objectManager->UnloadAll();
auto& objectManager = context->GetObjectManager();
objectManager.UnloadAll();
}
void* object_repository_load_object(const rct_object_entry* objectEntry)
{
Object* object = nullptr;
auto objRepository = GetContext()->GetObjectRepository();
const ObjectRepositoryItem* ori = objRepository->FindObject(objectEntry);
auto& objRepository = GetContext()->GetObjectRepository();
const ObjectRepositoryItem* ori = objRepository.FindObject(objectEntry);
if (ori != nullptr)
{
object = objRepository->LoadObject(ori);
object = objRepository.LoadObject(ori);
if (object != nullptr)
{
object->Load();
@ -688,26 +688,26 @@ void scenario_translate(scenario_index_entry* scenarioEntry)
size_t object_repository_get_items_count()
{
auto objectRepository = GetContext()->GetObjectRepository();
return objectRepository->GetNumObjects();
auto& objectRepository = GetContext()->GetObjectRepository();
return objectRepository.GetNumObjects();
}
const ObjectRepositoryItem* object_repository_get_items()
{
auto objectRepository = GetContext()->GetObjectRepository();
return objectRepository->GetObjects();
auto& objectRepository = GetContext()->GetObjectRepository();
return objectRepository.GetObjects();
}
const ObjectRepositoryItem* object_repository_find_object_by_entry(const rct_object_entry* entry)
{
auto objectRepository = GetContext()->GetObjectRepository();
return objectRepository->FindObject(entry);
auto& objectRepository = GetContext()->GetObjectRepository();
return objectRepository.FindObject(entry);
}
const ObjectRepositoryItem* object_repository_find_object_by_name(const char* name)
{
auto objectRepository = GetContext()->GetObjectRepository();
return objectRepository->FindObject(name);
auto& objectRepository = GetContext()->GetObjectRepository();
return objectRepository.FindObject(name);
}
void object_delete(void* object)

8
src/openrct2/object/SceneryGroupObject.cpp
View File

@ -70,19 +70,19 @@ void SceneryGroupObject::DrawPreview(rct_drawpixelinfo* dpi, int32_t width, int3
void SceneryGroupObject::UpdateEntryIndexes()
{
auto context = GetContext();
auto objectRepository = context->GetObjectRepository();
auto objectManager = context->GetObjectManager();
auto& objectRepository = context->GetObjectRepository();
auto& objectManager = context->GetObjectManager();
_legacyType.entry_count = 0;
for (const auto& objectEntry : _items)
{
auto ori = objectRepository->FindObject(&objectEntry);
auto ori = objectRepository.FindObject(&objectEntry);
if (ori == nullptr)
continue;
if (ori->LoadedObject == nullptr)
continue;
uint16_t sceneryEntry = objectManager->GetLoadedObjectEntryIndex(ori->LoadedObject);
uint16_t sceneryEntry = objectManager.GetLoadedObjectEntryIndex(ori->LoadedObject);
Guard::Assert(sceneryEntry != UINT8_MAX, GUARD_LINE);
auto objectType = ori->ObjectEntry.flags & 0x0F;

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

@ -334,7 +334,7 @@ private:
// Do map initialisation, same kind of stuff done when loading scenario editor
auto context = OpenRCT2::GetContext();
context->GetObjectManager()->UnloadAll();
context->GetObjectManager().UnloadAll();
context->GetGameState()->InitAll(mapSize);
gS6Info.editor_step = EDITOR_STEP_OBJECT_SELECTION;
gParkFlags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES;
@ -542,8 +542,8 @@ private:
std::vector<const char*> objects = RCT1::GetSceneryObjects(sceneryTheme);
for (const char* objectName : objects)
{
auto objectRepository = OpenRCT2::GetContext()->GetObjectRepository();
auto foundObject = objectRepository->FindObject(objectName);
auto& objectRepository = OpenRCT2::GetContext()->GetObjectRepository();
auto foundObject = objectRepository.FindObject(objectName);
if (foundObject != nullptr)
{
uint8_t objectType = object_entry_get_type(&foundObject->ObjectEntry);
@ -1827,8 +1827,8 @@ private:
void LoadObjects()
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager->LoadDefaultObjects();
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager.LoadDefaultObjects();
LoadObjects(OBJECT_TYPE_RIDE, _rideEntries);
LoadObjects(OBJECT_TYPE_SMALL_SCENERY, _smallSceneryEntries);
@ -1861,7 +1861,7 @@ private:
void LoadObjects(uint8_t objectType, const std::vector<const char*>& entries)
{
auto objectManager = OpenRCT2::GetContext()->GetObjectManager();
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
uint32_t entryIndex = 0;
for (const char* objectName : entries)
@ -1871,7 +1871,7 @@ private:
std::copy_n(objectName, 8, entry.name);
entry.checksum = 0;
Object* object = objectManager->LoadObject(&entry);
Object* object = objectManager.LoadObject(&entry);
if (object == nullptr && objectType != OBJECT_TYPE_SCENERY_GROUP)
{
log_error("Failed to load %s.", objectName);
@ -1930,7 +1930,7 @@ private:
void GetInvalidObjects(
uint8_t objectType, const std::vector<const char*>& entries, std::vector<rct_object_entry>& missingObjects)
{
auto objectRepository = OpenRCT2::GetContext()->GetObjectRepository();
auto& objectRepository = OpenRCT2::GetContext()->GetObjectRepository();
for (const char* objectName : entries)
{
rct_object_entry entry;
@ -1938,7 +1938,7 @@ private:
std::copy_n(objectName, DAT_NAME_LENGTH, entry.name);
entry.checksum = 0;
const ObjectRepositoryItem* ori = objectRepository->FindObject(&entry);
const ObjectRepositoryItem* ori = objectRepository.FindObject(&entry);
if (ori == nullptr)
{
missingObjects.push_back(entry);
@ -1946,7 +1946,7 @@ private:
}
else
{
Object* object = objectRepository->LoadObject(ori);
Object* object = objectRepository.LoadObject(ori);
if (object == nullptr && objectType != OBJECT_TYPE_SCENERY_GROUP)
{
missingObjects.push_back(entry);
@ -2865,19 +2865,19 @@ std::unique_ptr<IParkImporter> ParkImporter::CreateS4()
void load_from_sv4(const utf8* path)
{
auto objectMgr = GetContext()->GetObjectManager();
auto& objectMgr = GetContext()->GetObjectManager();
auto s4Importer = std::make_unique<S4Importer>();
auto result = s4Importer->LoadSavedGame(path);
objectMgr->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
objectMgr.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
s4Importer->Import();
}
void load_from_sc4(const utf8* path)
{
auto objectMgr = GetContext()->GetObjectManager();
auto& objectMgr = GetContext()->GetObjectManager();
auto s4Importer = std::make_unique<S4Importer>();
auto result = s4Importer->LoadScenario(path);
objectMgr->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
objectMgr.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
s4Importer->Import();
}

8
src/openrct2/rct2/S6Exporter.cpp
View File

@ -101,8 +101,8 @@ void S6Exporter::Save(IStream* stream, bool isScenario)
// 2: Write packed objects
if (_s6.header.num_packed_objects > 0)
{
auto objRepo = OpenRCT2::GetContext()->GetObjectRepository();
objRepo->WritePackedObjects(stream, ExportObjectsList);
auto& objRepo = OpenRCT2::GetContext()->GetObjectRepository();
objRepo.WritePackedObjects(stream, ExportObjectsList);
}
// 3: Write available objects chunk
@ -768,8 +768,8 @@ int32_t scenario_save(const utf8* path, int32_t flags)
{
if (flags & S6_SAVE_FLAG_EXPORT)
{
auto objManager = OpenRCT2::GetContext()->GetObjectManager();
s6exporter->ExportObjectsList = objManager->GetPackableObjects();
auto& objManager = OpenRCT2::GetContext()->GetObjectManager();
s6exporter->ExportObjectsList = objManager.GetPackableObjects();
}
s6exporter->RemoveTracklessRides = true;
s6exporter->Export();

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

@ -56,15 +56,15 @@
class S6Importer final : public IParkImporter
{
private:
std::shared_ptr<IObjectRepository> const _objectRepository;
std::shared_ptr<IObjectManager> const _objectManager;
IObjectRepository& _objectRepository;
IObjectManager& _objectManager;
const utf8* _s6Path = nullptr;
rct_s6_data _s6{};
uint8_t _gameVersion = 0;
public:
S6Importer(std::shared_ptr<IObjectRepository> objectRepository, std::shared_ptr<IObjectManager> objectManager)
S6Importer(IObjectRepository& objectRepository, IObjectManager& objectManager)
: _objectRepository(objectRepository)
, _objectManager(objectManager)
{
@ -141,7 +141,7 @@ public:
// TODO try to contain this more and not store objects until later
for (uint16_t i = 0; i < _s6.header.num_packed_objects; i++)
{
_objectRepository->ExportPackedObject(stream);
_objectRepository.ExportPackedObject(stream);
}
if (isScenario)
@ -846,7 +846,7 @@ public:
};
std::unique_ptr<IParkImporter> ParkImporter::CreateS6(
std::shared_ptr<IObjectRepository> objectRepository, std::shared_ptr<IObjectManager> objectManager)
IObjectRepository& objectRepository, IObjectManager& objectManager)
{
return std::make_unique<S6Importer>(objectRepository, objectManager);
}
@ -857,9 +857,9 @@ void load_from_sv6(const char* path)
auto s6Importer = std::make_unique<S6Importer>(context->GetObjectRepository(), context->GetObjectManager());
try
{
auto objectMgr = context->GetObjectManager();
auto& objectMgr = context->GetObjectManager();
auto result = s6Importer->LoadSavedGame(path);
objectMgr->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
objectMgr.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
s6Importer->Import();
game_fix_save_vars();
sprite_position_tween_reset();
@ -891,12 +891,12 @@ void load_from_sv6(const char* path)
void load_from_sc6(const char* path)
{
auto context = OpenRCT2::GetContext();
auto objManager = context->GetObjectManager();
auto s6Importer = std::make_unique<S6Importer>(context->GetObjectRepository(), context->GetObjectManager());
auto& objManager = context->GetObjectManager();
auto s6Importer = std::make_unique<S6Importer>(context->GetObjectRepository(), objManager);
try
{
auto result = s6Importer->LoadScenario(path);
objManager->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
objManager.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
s6Importer->Import();
game_fix_save_vars();
sprite_position_tween_reset();

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

@ -233,15 +233,14 @@ Ride* get_ride(int32_t index)
rct_ride_entry* get_ride_entry(int32_t index)
{
rct_ride_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_RIDE, index);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_RIDE, index);
if (obj != nullptr)
{
result = (rct_ride_entry*)obj->GetLegacyData();
}
result = (rct_ride_entry*)obj->GetLegacyData();
}
return result;
}

16
src/openrct2/ride/TrackDesignRepository.cpp
View File

@ -153,7 +153,7 @@ public:
size_t GetCountForObjectEntry(uint8_t rideType, const std::string& entry) const override
{
size_t count = 0;
const auto repo = GetContext()->GetObjectRepository();
const auto& repo = GetContext()->GetObjectRepository();
for (const auto& item : _items)
{
@ -165,7 +165,7 @@ public:
bool entryIsNotSeparate = false;
if (entry.empty())
{
const ObjectRepositoryItem* ori = repo->FindObject(item.ObjectEntry.c_str());
const ObjectRepositoryItem* ori = repo.FindObject(item.ObjectEntry.c_str());
if (ori == nullptr || !RideGroupManager::RideTypeIsIndependent(rideType))
entryIsNotSeparate = true;
@ -182,7 +182,7 @@ public:
size_t GetCountForRideGroup(uint8_t rideType, const RideGroup* rideGroup) const override
{
size_t count = 0;
const auto repo = GetContext()->GetObjectRepository();
const auto& repo = GetContext()->GetObjectRepository();
for (const auto& item : _items)
{
@ -191,7 +191,7 @@ public:
continue;
}
const ObjectRepositoryItem* ori = repo->FindObject(item.ObjectEntry.c_str());
const ObjectRepositoryItem* ori = repo.FindObject(item.ObjectEntry.c_str());
uint8_t rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup* itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);
@ -212,7 +212,7 @@ public:
std::vector<track_design_file_ref> GetItemsForObjectEntry(uint8_t rideType, const std::string& entry) const override
{
std::vector<track_design_file_ref> refs;
const auto repo = GetContext()->GetObjectRepository();
const auto& repo = GetContext()->GetObjectRepository();
for (const auto& item : _items)
{
@ -224,7 +224,7 @@ public:
bool entryIsNotSeparate = false;
if (entry.empty())
{
const ObjectRepositoryItem* ori = repo->FindObject(item.ObjectEntry.c_str());
const ObjectRepositoryItem* ori = repo.FindObject(item.ObjectEntry.c_str());
if (ori == nullptr || !RideGroupManager::RideTypeIsIndependent(rideType))
entryIsNotSeparate = true;
@ -245,7 +245,7 @@ public:
std::vector<track_design_file_ref> GetItemsForRideGroup(uint8_t rideType, const RideGroup* rideGroup) const override
{
std::vector<track_design_file_ref> refs;
const auto repo = GetContext()->GetObjectRepository();
const auto& repo = GetContext()->GetObjectRepository();
for (const auto& item : _items)
{
@ -254,7 +254,7 @@ public:
continue;
}
const ObjectRepositoryItem* ori = repo->FindObject(item.ObjectEntry.c_str());
const ObjectRepositoryItem* ori = repo.FindObject(item.ObjectEntry.c_str());
uint8_t rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup* itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);

11
src/openrct2/world/Footpath.cpp
View File

@ -2612,14 +2612,11 @@ void footpath_remove_edges_at(int32_t x, int32_t y, rct_tile_element* tileElemen
rct_footpath_entry* get_footpath_entry(int32_t entryIndex)
{
rct_footpath_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_PATHS, entryIndex);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_PATHS, entryIndex);
if (obj != nullptr)
{
result = (rct_footpath_entry*)obj->GetLegacyData();
}
result = (rct_footpath_entry*)obj->GetLegacyData();
}
return result;
}

66
src/openrct2/world/Scenery.cpp
View File

@ -258,14 +258,11 @@ void scenery_remove_ghost_tool_placement()
rct_scenery_entry* get_small_scenery_entry(int32_t entryIndex)
{
rct_scenery_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_SMALL_SCENERY, entryIndex);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_SMALL_SCENERY, entryIndex);
if (obj != nullptr)
{
result = (rct_scenery_entry*)obj->GetLegacyData();
}
result = (rct_scenery_entry*)obj->GetLegacyData();
}
return result;
}
@ -273,14 +270,11 @@ rct_scenery_entry* get_small_scenery_entry(int32_t entryIndex)
rct_scenery_entry* get_large_scenery_entry(int32_t entryIndex)
{
rct_scenery_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_LARGE_SCENERY, entryIndex);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_LARGE_SCENERY, entryIndex);
if (obj != nullptr)
{
result = (rct_scenery_entry*)obj->GetLegacyData();
}
result = (rct_scenery_entry*)obj->GetLegacyData();
}
return result;
}
@ -288,14 +282,11 @@ rct_scenery_entry* get_large_scenery_entry(int32_t entryIndex)
rct_scenery_entry* get_wall_entry(int32_t entryIndex)
{
rct_scenery_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_WALLS, entryIndex);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_WALLS, entryIndex);
if (obj != nullptr)
{
result = (rct_scenery_entry*)obj->GetLegacyData();
}
result = (rct_scenery_entry*)obj->GetLegacyData();
}
return result;
}
@ -303,14 +294,11 @@ rct_scenery_entry* get_wall_entry(int32_t entryIndex)
rct_scenery_entry* get_banner_entry(int32_t entryIndex)
{
rct_scenery_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_BANNERS, entryIndex);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_BANNERS, entryIndex);
if (obj != nullptr)
{
result = (rct_scenery_entry*)obj->GetLegacyData();
}
result = (rct_scenery_entry*)obj->GetLegacyData();
}
return result;
}
@ -318,14 +306,11 @@ rct_scenery_entry* get_banner_entry(int32_t entryIndex)
rct_scenery_entry* get_footpath_item_entry(int32_t entryIndex)
{
rct_scenery_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_PATH_BITS, entryIndex);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_PATH_BITS, entryIndex);
if (obj != nullptr)
{
result = (rct_scenery_entry*)obj->GetLegacyData();
}
result = (rct_scenery_entry*)obj->GetLegacyData();
}
return result;
}
@ -333,14 +318,11 @@ rct_scenery_entry* get_footpath_item_entry(int32_t entryIndex)
rct_scenery_group_entry* get_scenery_group_entry(int32_t entryIndex)
{
rct_scenery_group_entry* result = nullptr;
auto objMgr = OpenRCT2::GetContext()->GetObjectManager();
if (objMgr != nullptr)
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(OBJECT_TYPE_SCENERY_GROUP, entryIndex);
if (obj != nullptr)
{
auto obj = objMgr->GetLoadedObject(OBJECT_TYPE_SCENERY_GROUP, entryIndex);
if (obj != nullptr)
{
result = (rct_scenery_group_entry*)obj->GetLegacyData();
}
result = (rct_scenery_group_entry*)obj->GetLegacyData();
}
return result;
}