mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 17:24:47 +01:00
Code Issues Releases Wiki Activity

Merge pull request #17929 from IntelOrca/rctc-support

Browse Source 
Add support for RCT Classic assets
This commit is contained in:
Michael Steenbeek
2022-08-31 23:26:25 +02:00
committed by GitHub
parent 5f24099f39 6d3a3cec76
commit a5a6d3a66c
12 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/openrct2/PlatformEnvironment.cpp
View File

@@ -22,6 +22,7 @@ class PlatformEnvironment final : public IPlatformEnvironment
{
private:
u8string _basePath[DIRBASE_COUNT];
bool _usingRctClassic{};
public:
explicit PlatformEnvironment(DIRBASE_VALUES basePaths)
@@ -45,9 +46,11 @@ public:
{
default:
case DIRBASE::RCT1:
case DIRBASE::RCT2:
directoryName = DirectoryNamesRCT2[static_cast<size_t>(did)];
break;
case DIRBASE::RCT2:
directoryName = _usingRctClassic ? "Assets" : DirectoryNamesRCT2[static_cast<size_t>(did)];
break;
case DIRBASE::OPENRCT2:
case DIRBASE::USER:
case DIRBASE::CONFIG:
@@ -69,6 +72,19 @@ public:
u8string FindFile(DIRBASE base, DIRID did, u8string_view fileName) const override
{
auto dataPath = GetDirectoryPath(base, did);
std::string alternativeFilename;
if (_usingRctClassic && base == DIRBASE::RCT2 && did == DIRID::DATA)
{
// Special case, handle RCT Classic css ogg files
if (String::StartsWith(fileName, "css", true) && String::EndsWith(fileName, ".dat", true))
{
alternativeFilename = fileName.substr(0, fileName.size() - 3);
alternativeFilename.append("ogg");
fileName = alternativeFilename;
}
}
auto path = Path::ResolveCasing(Path::Combine(dataPath, fileName));
if (base == DIRBASE::RCT1 && did == DIRID::DATA && !File::Exists(path))
{
@@ -80,12 +96,23 @@ public:
path = alternativePath;
}
}
return path;
}
void SetBasePath(DIRBASE base, u8string_view path) override
{
_basePath[static_cast<size_t>(base)] = path;
if (base == DIRBASE::RCT2)
{
_usingRctClassic = Platform::IsRCTClassicPath(path);
}
}
bool IsUsingClassic() const override
{
return _usingRctClassic;
}
private:

1
src/openrct2/PlatformEnvironment.h
View File

@@ -83,6 +83,7 @@ namespace OpenRCT2
virtual u8string GetFilePath(PATHID pathid) const abstract;
virtual u8string FindFile(DIRBASE base, DIRID did, u8string_view fileName) const abstract;
virtual void SetBasePath(DIRBASE base, u8string_view path) abstract;
virtual bool IsUsingClassic() const abstract;
};
[[nodiscard]] std::unique_ptr<IPlatformEnvironment> CreatePlatformEnvironment(DIRBASE_VALUES basePaths);

27
src/openrct2/audio/Audio.cpp
View File

@@ -12,6 +12,7 @@
#include "../Context.h"
#include "../Intro.h"
#include "../OpenRCT2.h"
#include "../PlatformEnvironment.h"
#include "../config/Config.h"
#include "../core/File.h"
#include "../core/FileStream.h"
@@ -98,11 +99,31 @@ namespace OpenRCT2::Audio
void LoadAudioObjects()
{
auto& objManager = GetContext()->GetObjectManager();
auto* baseAudio = objManager.LoadObject(AudioObjectIdentifiers::Rct2Base);
if (baseAudio != nullptr)
Object* baseAudio{};
// We have a different audio object for RCT Classic
auto env = GetContext()->GetPlatformEnvironment();
if (env->IsUsingClassic())
{
_soundsAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(baseAudio);
baseAudio = objManager.LoadObject(AudioObjectIdentifiers::Rct2cBase);
if (baseAudio != nullptr)
{
baseAudio->SetIdentifier(AudioObjectIdentifiers::Rct2Base);
_soundsAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(baseAudio);
}
}
if (baseAudio == nullptr)
{
// Fallback to vanilla RCT2 audio object
baseAudio = objManager.LoadObject(AudioObjectIdentifiers::Rct2Base);
if (baseAudio != nullptr)
{
_soundsAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(baseAudio);
}
}
objManager.LoadObject(AudioObjectIdentifiers::Rct2Circus);
}

1
src/openrct2/audio/audio.h
View File

@@ -137,6 +137,7 @@ namespace OpenRCT2::Audio
{
constexpr std::string_view Rct1Title = "rct1.audio.title";
constexpr std::string_view Rct2Base = "rct2.audio.base";
constexpr std::string_view Rct2cBase = "rct2.audio.base.rctc";
constexpr std::string_view Rct2Title = "rct2.audio.title";
constexpr std::string_view Rct2Circus = "rct2.audio.circus";
} // namespace AudioObjectIdentifiers

2
src/openrct2/drawing/Drawing.Sprite.cpp
View File

@@ -199,7 +199,7 @@ bool gfx_load_g1(const IPlatformEnvironment& env)
log_verbose("gfx_load_g1(...)");
try
{
auto path = Path::Combine(env.GetDirectoryPath(DIRBASE::RCT2, DIRID::DATA), u8"g1.dat");
auto path = env.FindFile(DIRBASE::RCT2, DIRID::DATA, u8"g1.dat");
auto fs = FileStream(path, FILE_MODE_OPEN);
_g1.header = fs.ReadValue<rct_g1_header>();

5
src/openrct2/object/MusicObject.cpp
View File

@@ -185,9 +185,8 @@ ObjectAsset MusicObject::GetAsset(IReadObjectContext& context, std::string_view
{
if (path.find("$RCT2:DATA/") == 0)
{
auto platformEnvironment = GetContext()->GetPlatformEnvironment();
auto dir = platformEnvironment->GetDirectoryPath(DIRBASE::RCT2, DIRID::DATA);
auto path2 = Path::Combine(dir, std::string(path.substr(11)));
auto env = GetContext()->GetPlatformEnvironment();
auto path2 = env->FindFile(DIRBASE::RCT2, DIRID::DATA, path.substr(11));
return ObjectAsset(path2);
}

5
src/openrct2/object/ObjectFactory.cpp
View File

@@ -502,7 +502,10 @@ namespace ObjectFactory
std::unique_ptr<Object> CreateObjectFromJson(
IObjectRepository& objectRepository, json_t& jRoot, const IFileDataRetriever* fileRetriever, bool loadImageTable)
{
Guard::Assert(jRoot.is_object(), "ObjectFactory::CreateObjectFromJson expects parameter jRoot to be object");
if (!jRoot.is_object())
{
throw std::runtime_error("Object JSON root was not an object");
}
log_verbose("CreateObjectFromJson(...)");

2
src/openrct2/platform/Platform.h
View File

@@ -87,6 +87,8 @@ namespace Platform
bool ProcessIsElevated();
float GetDefaultScale();
bool IsRCT2Path(std::string_view path);
bool IsRCTClassicPath(std::string_view path);
bool OriginalGameDataExists(std::string_view path);
std::string GetUsername();

15
src/openrct2/platform/Shared.cpp
View File

@@ -94,10 +94,21 @@ namespace Platform
return outTime;
}
bool IsRCT2Path(std::string_view path)
{
auto combinedPath = Path::ResolveCasing(Path::Combine(path, u8"Data", u8"g1.dat"));
return File::Exists(combinedPath);
}
bool IsRCTClassicPath(std::string_view path)
{
auto combinedPath = Path::ResolveCasing(Path::Combine(path, u8"Assets", u8"g1.dat"));
return File::Exists(combinedPath);
}
bool OriginalGameDataExists(std::string_view path)
{
std::string combinedPath = Path::ResolveCasing(Path::Combine(path, u8"Data", u8"g1.dat"));
return File::Exists(combinedPath);
return IsRCT2Path(path) || IsRCTClassicPath(path);
}
std::string SanitiseFilename(std::string_view originalName)