Archive/Starship
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-04-28 20:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compilation with latest LUS

Browse source
This commit is contained in:
KiritoDv 2025-03-16 18:53:42 -06:00
parent 0ba0dffe2b
commit e603bf3e7f
7 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/port/Engine.cpp
View file

@ -315,14 +315,14 @@ void GameEngine::LoadManifest() {
continue; continue;
} }
auto file = entry->LoadFile(path, init); auto file = entry->LoadFile(path);
if(file == nullptr){ if(file == nullptr){
continue; continue;
} }
auto raw = loader->LoadResource(file); auto raw = loader->LoadResource(path, file, init);
auto res = static_pointer_cast<Ship::Json>(raw); auto res = std::static_pointer_cast<Ship::Json>(raw);
if (res == nullptr) { if (res == nullptr) {
continue; continue;
} }

6
src/port/lua/scripting.cpp
View file

@ -64,10 +64,10 @@ std::optional<std::string> LoadFromO2R(const std::string& path, const std::share
std::shared_ptr<SF64::Text> res; std::shared_ptr<SF64::Text> res;
if (archive == nullptr) { if (archive == nullptr) {
res = static_pointer_cast<SF64::Text>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(path, true, init)); res = std::static_pointer_cast<SF64::Text>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(path, true, init));
} else { } else {
auto file = archive->LoadFile(path, init); auto file = archive->LoadFile(path);
res = static_pointer_cast<SF64::Text>(loader->GetResourceLoader()->LoadResource(file)); res = std::static_pointer_cast<SF64::Text>(loader->GetResourceLoader()->LoadResource(path, file, init));
} }
if (res == nullptr) { if (res == nullptr) {

6
src/port/resource/importers/MessageFactory.cpp
View file

@ -39,10 +39,12 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryMessageV0::ReadResource(st
return msg; return msg;
} }
std::shared_ptr<Ship::IResource> ResourceFactoryXMLMessageV0::ReadResource(std::shared_ptr<Ship::File> file) { std::shared_ptr<Ship::IResource> ResourceFactoryXMLMessageV0::ReadResource(std::shared_ptr<Ship::File> file,
if (!FileHasValidFormatAndReader(file)) { std::shared_ptr<Ship::ResourceInitData> initData) {
if (!FileHasValidFormatAndReader(file, initData)) {
return nullptr; return nullptr;
} }
auto msg = std::make_shared<Message>(file->InitData); auto msg = std::make_shared<Message>(file->InitData);
auto parent = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement("Message"); auto parent = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement("Message");
auto id = parent->IntAttribute("Id", -1); auto id = parent->IntAttribute("Id", -1);

3
src/port/resource/importers/MessageFactory.h
View file

@ -14,7 +14,8 @@ class ResourceFactoryBinaryMessageV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryXMLMessageV0 : public Ship::ResourceFactoryXML { class ResourceFactoryXMLMessageV0 : public Ship::ResourceFactoryXML {
public: public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override; std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;
}; };
}; // namespace LUS }; // namespace LUS
#else #else

5
src/port/resource/importers/TextFactory.cpp
View file

@ -2,8 +2,9 @@
#include "../type/Text.h" #include "../type/Text.h"
namespace SF64 { namespace SF64 {
std::shared_ptr<Ship::IResource> ResourceFactoryBinaryTextV0::ReadResource(std::shared_ptr<Ship::File> file) { std::shared_ptr<Ship::IResource> ResourceFactoryBinaryTextV0::ReadResource(std::shared_ptr<Ship::File> file,
if (!FileHasValidFormatAndReader(file)) { std::shared_ptr<Ship::ResourceInitData> initData) {
if (!FileHasValidFormatAndReader(file, initData)) {
return nullptr; return nullptr;
} }

3
src/port/resource/importers/TextFactory.h
View file

@ -6,6 +6,7 @@
namespace SF64 { namespace SF64 {
class ResourceFactoryBinaryTextV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryTextV0 : public Ship::ResourceFactoryBinary {
public: public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override; std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;
}; };
}; // namespace SF64 }; // namespace SF64

6
src/port/resource/importers/audio/SoundFontFactory.cpp
View file

@ -140,7 +140,7 @@ void ResourceFactoryXMLSoundFontV0::ParseInstruments(SoundFont* soundFont, tinyx
instrument->lowPitchTunedSample.tuning = instrumentElement->FloatAttribute("Tuning"); instrument->lowPitchTunedSample.tuning = instrumentElement->FloatAttribute("Tuning");
const char* sampleStr = instrumentElement->Attribute("SampleRef"); const char* sampleStr = instrumentElement->Attribute("SampleRef");
if (sampleStr != nullptr && sampleStr[0] != 0) { if (sampleStr != nullptr && sampleStr[0] != 0) {
auto res = static_pointer_cast<Sample>( auto res = std::static_pointer_cast<Sample>(
Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr, true)); Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr, true));
auto sample = static_cast<SampleData*>(res ? res->GetRawPointer() : nullptr); auto sample = static_cast<SampleData*>(res ? res->GetRawPointer() : nullptr);
instrument->lowPitchTunedSample.sample = sample; instrument->lowPitchTunedSample.sample = sample;
@ -155,7 +155,7 @@ void ResourceFactoryXMLSoundFontV0::ParseInstruments(SoundFont* soundFont, tinyx
instrument->normalPitchTunedSample.tuning = instrumentElement->FloatAttribute("Tuning"); instrument->normalPitchTunedSample.tuning = instrumentElement->FloatAttribute("Tuning");
const char* sampleStr = instrumentElement->Attribute("SampleRef"); const char* sampleStr = instrumentElement->Attribute("SampleRef");
if (sampleStr != nullptr && sampleStr[0] != 0) { if (sampleStr != nullptr && sampleStr[0] != 0) {
auto res = static_pointer_cast<Sample>( auto res = std::static_pointer_cast<Sample>(
Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr, true)); Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr, true));
auto sample = static_cast<SampleData*>(res ? res->GetRawPointer() : nullptr); auto sample = static_cast<SampleData*>(res ? res->GetRawPointer() : nullptr);
instrument->normalPitchTunedSample.sample = sample; instrument->normalPitchTunedSample.sample = sample;
@ -170,7 +170,7 @@ void ResourceFactoryXMLSoundFontV0::ParseInstruments(SoundFont* soundFont, tinyx
instrument->highPitchTunedSample.tuning = instrumentElement->FloatAttribute("Tuning"); instrument->highPitchTunedSample.tuning = instrumentElement->FloatAttribute("Tuning");
const char* sampleStr = instrumentElement->Attribute("SampleRef"); const char* sampleStr = instrumentElement->Attribute("SampleRef");
if (sampleStr != nullptr && sampleStr[0] != 0) { if (sampleStr != nullptr && sampleStr[0] != 0) {
auto res = static_pointer_cast<Sample>( auto res = std::static_pointer_cast<Sample>(
Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr, true)); Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr, true));
auto sample = static_cast<SampleData*>(res ? res->GetRawPointer() : nullptr); auto sample = static_cast<SampleData*>(res ? res->GetRawPointer() : nullptr);
instrument->highPitchTunedSample.sample = sample; instrument->highPitchTunedSample.sample = sample;