mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity

Give context the ownership of repositories and the object manager (#7340)

Browse Source 
This makes them no longer a singleton, which fixes annoying behaviour when launching multiple contexts in one game session.
This commit is contained in:
Hielke Morsink
2018-04-10 14:19:23 +02:00
committed by Ted John
parent 8fbe6e63d8
commit dc673a64d8
22 changed files with 117 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
#include <algorithm>
#include <memory>
#include <vector>
#include "../Context.h"
#include "../config/Config.h"
#include "../core/Collections.hpp"
#include "../core/Console.hpp"
@@ -164,7 +165,7 @@ public:
size_t GetCountForObjectEntry(uint8 rideType, const std::string &entry) const override
{
size_t count = 0;
const IObjectRepository * repo = GetObjectRepository();
const IObjectRepository * repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -193,7 +194,7 @@ public:
size_t GetCountForRideGroup(uint8 rideType, const RideGroup * rideGroup) const override
{
size_t count = 0;
const IObjectRepository * repo = GetObjectRepository();
const IObjectRepository * repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -225,7 +226,7 @@ public:
std::vector<track_design_file_ref> GetItemsForObjectEntry(uint8 rideType, const std::string &entry) const override
{
std::vector<track_design_file_ref> refs;
const IObjectRepository * repo = GetObjectRepository();
const IObjectRepository * repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -258,7 +259,7 @@ public:
std::vector<track_design_file_ref> GetItemsForRideGroup(uint8 rideType, const RideGroup * rideGroup) const override
{
std::vector<track_design_file_ref> refs;
const IObjectRepository * repo = GetObjectRepository();
const IObjectRepository * repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -395,42 +396,33 @@ private:
}
};
static TrackDesignRepository * _trackDesignRepository = nullptr;
ITrackDesignRepository * CreateTrackDesignRepository(IPlatformEnvironment * env)
{
_trackDesignRepository = new TrackDesignRepository(env);
return _trackDesignRepository;
}
ITrackDesignRepository * GetTrackDesignRepository()
{
return _trackDesignRepository;
return new TrackDesignRepository(env);
}
void track_repository_scan()
{
ITrackDesignRepository * repo = GetTrackDesignRepository();
ITrackDesignRepository * repo = GetContext()->GetTrackDesignRepository();
repo->Scan();
}
bool track_repository_delete(const utf8 * path)
{
ITrackDesignRepository * repo = GetTrackDesignRepository();
ITrackDesignRepository * repo = GetContext()->GetTrackDesignRepository();
return repo->Delete(path);
}
bool track_repository_rename(const utf8 * path, const utf8 * newName)
{
ITrackDesignRepository * repo = GetTrackDesignRepository();
ITrackDesignRepository * repo = GetContext()->GetTrackDesignRepository();
std::string newPath = repo->Rename(path, newName);
return !newPath.empty();
}
bool track_repository_install(const utf8 * srcPath)
{
ITrackDesignRepository * repo = GetTrackDesignRepository();
ITrackDesignRepository * repo = GetContext()->GetTrackDesignRepository();
std::string newPath = repo->Install(srcPath);
return !newPath.empty();
}