github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

more issues like #5443

Browse source
This commit is contained in:
Demur Rumed 2025-05-18 22:18:26 +00:00
commit 4802198588
44 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/soh/config/ConfigUpdaters.h
View file

@ -1,19 +1,19 @@
#include "libultraship/libultraship.h"
namespace SOH {
class ConfigVersion1Updater : public Ship::ConfigVersionUpdater {
class ConfigVersion1Updater final : public Ship::ConfigVersionUpdater {
public:
ConfigVersion1Updater();
void Update(Ship::Config* conf);
};
class ConfigVersion2Updater : public Ship::ConfigVersionUpdater {
class ConfigVersion2Updater final : public Ship::ConfigVersionUpdater {
public:
ConfigVersion2Updater();
void Update(Ship::Config* conf);
};
class ConfigVersion3Updater : public Ship::ConfigVersionUpdater {
class ConfigVersion3Updater final : public Ship::ConfigVersionUpdater {
public:
ConfigVersion3Updater();
void Update(Ship::Config* conf);

2
soh/soh/resource/importer/AnimationFactory.h
View file

@ -4,7 +4,7 @@
#include "ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryAnimationV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryAnimationV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

2
soh/soh/resource/importer/ArrayFactory.h
View file

@ -4,7 +4,7 @@
#include "resource/ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryArrayV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryArrayV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

2
soh/soh/resource/importer/AudioSampleFactory.h
View file

@ -4,7 +4,7 @@
#include "ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryAudioSampleV2 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryAudioSampleV2 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

6
soh/soh/resource/importer/AudioSequenceFactory.cpp
View file

@ -15,7 +15,7 @@ ResourceFactoryBinaryAudioSequenceV2::ReadResource(std::shared_ptr<Ship::File> f
audioSequence->sequence.seqDataSize = reader->ReadInt32();
audioSequence->sequenceData.reserve(audioSequence->sequence.seqDataSize);
for (uint32_t i = 0; i < audioSequence->sequence.seqDataSize; i++) {
for (int32_t i = 0; i < audioSequence->sequence.seqDataSize; i++) {
audioSequence->sequenceData.push_back(reader->ReadChar());
}
audioSequence->sequence.seqData = audioSequence->sequenceData.data();
@ -25,10 +25,10 @@ ResourceFactoryBinaryAudioSequenceV2::ReadResource(std::shared_ptr<Ship::File> f
audioSequence->sequence.cachePolicy = reader->ReadUByte();
audioSequence->sequence.numFonts = reader->ReadUInt32();
for (uint32_t i = 0; i < 16; i++) {
for (int32_t i = 0; i < 16; i++) {
audioSequence->sequence.fonts[i] = 0;
}
for (uint32_t i = 0; i < audioSequence->sequence.numFonts; i++) {
for (int32_t i = 0; i < audioSequence->sequence.numFonts; i++) {
audioSequence->sequence.fonts[i] = reader->ReadUByte();
}

2
soh/soh/resource/importer/AudioSequenceFactory.h
View file

@ -4,7 +4,7 @@
#include "ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryAudioSequenceV2 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryAudioSequenceV2 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

2
soh/soh/resource/importer/AudioSoundFontFactory.h
View file

@ -4,7 +4,7 @@
#include "ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryAudioSoundFontV2 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryAudioSoundFontV2 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

2
soh/soh/resource/importer/BackgroundFactory.h
View file

@ -4,7 +4,7 @@
#include "resource/ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryBackgroundV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryBackgroundV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

4
soh/soh/resource/importer/CollisionHeaderFactory.h
View file

@ -5,13 +5,13 @@
#include "ResourceFactoryXML.h"
namespace SOH {
class ResourceFactoryBinaryCollisionHeaderV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryCollisionHeaderV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;
};
class ResourceFactoryXMLCollisionHeaderV0 : public Ship::ResourceFactoryXML {
class ResourceFactoryXMLCollisionHeaderV0 final : public Ship::ResourceFactoryXML {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

2
soh/soh/resource/importer/CutsceneFactory.h
View file

@ -4,7 +4,7 @@
#include "ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryCutsceneV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryCutsceneV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

4
soh/soh/resource/importer/PathFactory.h
View file

@ -5,13 +5,13 @@
#include "ResourceFactoryXML.h"
namespace SOH {
class ResourceFactoryBinaryPathV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryPathV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;
};
class ResourceFactoryXMLPathV0 : public Ship::ResourceFactoryXML {
class ResourceFactoryXMLPathV0 final : public Ship::ResourceFactoryXML {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

2
soh/soh/resource/importer/PlayerAnimationFactory.h
View file

@ -4,7 +4,7 @@
#include "ResourceFactoryBinary.h"
namespace SOH {
class ResourceFactoryBinaryPlayerAnimationV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryPlayerAnimationV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

4
soh/soh/resource/importer/SceneFactory.h
View file

@ -8,7 +8,7 @@
#include "ResourceFactoryXML.h"
namespace SOH {
class ResourceFactoryBinarySceneV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinarySceneV0 final : public Ship::ResourceFactoryBinary {
public:
ResourceFactoryBinarySceneV0();
@ -28,7 +28,7 @@ class ResourceFactoryBinarySceneV0 : public Ship::ResourceFactoryBinary {
std::shared_ptr<Ship::BinaryReader> reader, uint32_t index);
};
class ResourceFactoryXMLSceneV0 : public Ship::ResourceFactoryXML {
class ResourceFactoryXMLSceneV0 final : public Ship::ResourceFactoryXML {
public:
ResourceFactoryXMLSceneV0();

2
soh/soh/resource/importer/SkeletonFactory.cpp
View file

@ -23,7 +23,7 @@ ResourceFactoryBinarySkeletonV0::ReadResource(std::shared_ptr<Ship::File> file,
skeleton->limbTableCount = reader->ReadUInt32();
skeleton->limbTable.reserve(skeleton->limbTableCount);
for (uint32_t i = 0; i < skeleton->limbTableCount; i++) {
for (int32_t i = 0; i < skeleton->limbTableCount; i++) {
std::string limbPath = reader->ReadString();
skeleton->limbTable.push_back(limbPath);

4
soh/soh/resource/importer/SkeletonFactory.h
View file

@ -5,13 +5,13 @@
#include "ResourceFactoryXML.h"
namespace SOH {
class ResourceFactoryBinarySkeletonV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinarySkeletonV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;
};
class ResourceFactoryXMLSkeletonV0 : public Ship::ResourceFactoryXML {
class ResourceFactoryXMLSkeletonV0 final : public Ship::ResourceFactoryXML {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

4
soh/soh/resource/importer/SkeletonLimbFactory.h
View file

@ -5,13 +5,13 @@
#include "ResourceFactoryXML.h"
namespace SOH {
class ResourceFactoryBinarySkeletonLimbV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinarySkeletonLimbV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;
};
class ResourceFactoryXMLSkeletonLimbV0 : public Ship::ResourceFactoryXML {
class ResourceFactoryXMLSkeletonLimbV0 final : public Ship::ResourceFactoryXML {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

4
soh/soh/resource/importer/TextFactory.h
View file

@ -5,13 +5,13 @@
#include "ResourceFactoryXML.h"
namespace SOH {
class ResourceFactoryBinaryTextV0 : public Ship::ResourceFactoryBinary {
class ResourceFactoryBinaryTextV0 final : public Ship::ResourceFactoryBinary {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;
};
class ResourceFactoryXMLTextV0 : public Ship::ResourceFactoryXML {
class ResourceFactoryXMLTextV0 final : public Ship::ResourceFactoryXML {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
std::shared_ptr<Ship::ResourceInitData> initData) override;

4
soh/soh/resource/importer/scenecommand/EndMarkerFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class EndMarkerFactory : public SceneCommandFactoryBinaryV0 {
class EndMarkerFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class EndMarkerFactoryXML : public SceneCommandFactoryXMLV0 {
class EndMarkerFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetActorListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetActorListFactory : public SceneCommandFactoryBinaryV0 {
class SetActorListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetActorListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetActorListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetAlternateHeadersFactory : public SceneCommandFactoryBinaryV0 {
class SetAlternateHeadersFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetAlternateHeadersFactoryXML : public SceneCommandFactoryXMLV0 {
class SetAlternateHeadersFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetCameraSettingsFactory : public SceneCommandFactoryBinaryV0 {
class SetCameraSettingsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetCameraSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetCameraSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetCollisionHeaderFactory : public SceneCommandFactoryBinaryV0 {
class SetCollisionHeaderFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetCollisionHeaderFactoryXML : public SceneCommandFactoryXMLV0 {
class SetCollisionHeaderFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetCsCameraFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetCsCameraFactory : public SceneCommandFactoryBinaryV0 {
class SetCsCameraFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetCsCameraFactoryXML : public SceneCommandFactoryXMLV0 {
class SetCsCameraFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetCutscenesFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetCutscenesFactory : public SceneCommandFactoryBinaryV0 {
class SetCutscenesFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetCutscenesFactoryXML : public SceneCommandFactoryXMLV0 {
class SetCutscenesFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetEchoSettingsFactory : public SceneCommandFactoryBinaryV0 {
class SetEchoSettingsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetEchoSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetEchoSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetEntranceListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetEntranceListFactory : public SceneCommandFactoryBinaryV0 {
class SetEntranceListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetEntranceListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetEntranceListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetExitListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetExitListFactory : public SceneCommandFactoryBinaryV0 {
class SetExitListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetExitListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetExitListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetLightListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetLightListFactory : public SceneCommandFactoryBinaryV0 {
class SetLightListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetLightListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetLightListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetLightingSettingsFactory : public SceneCommandFactoryBinaryV0 {
class SetLightingSettingsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetLightingSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetLightingSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetMeshFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetMeshFactory : public SceneCommandFactoryBinaryV0 {
class SetMeshFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetMeshFactoryXML : public SceneCommandFactoryXMLV0 {
class SetMeshFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetObjectListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetObjectListFactory : public SceneCommandFactoryBinaryV0 {
class SetObjectListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetObjectListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetObjectListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetPathwaysFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetPathwaysFactory : public SceneCommandFactoryBinaryV0 {
class SetPathwaysFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetPathwaysFactoryXML : public SceneCommandFactoryXMLV0 {
class SetPathwaysFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetRoomBehaviorFactory : public SceneCommandFactoryBinaryV0 {
class SetRoomBehaviorFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetRoomBehaviorFactoryXML : public SceneCommandFactoryXMLV0 {
class SetRoomBehaviorFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetRoomListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetRoomListFactory : public SceneCommandFactoryBinaryV0 {
class SetRoomListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetRoomListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetRoomListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetSkyboxModifierFactory : public SceneCommandFactoryBinaryV0 {
class SetSkyboxModifierFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetSkyboxModifierFactoryXML : public SceneCommandFactoryXMLV0 {
class SetSkyboxModifierFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetSkyboxSettingsFactory : public SceneCommandFactoryBinaryV0 {
class SetSkyboxSettingsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetSkyboxSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetSkyboxSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetSoundSettingsFactory : public SceneCommandFactoryBinaryV0 {
class SetSoundSettingsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetSoundSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetSoundSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetSpecialObjectsFactory : public SceneCommandFactoryBinaryV0 {
class SetSpecialObjectsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetSpecialObjectsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetSpecialObjectsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetStartPositionListFactory : public SceneCommandFactoryBinaryV0 {
class SetStartPositionListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetStartPositionListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetStartPositionListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetTimeSettingsFactory : public SceneCommandFactoryBinaryV0 {
class SetTimeSettingsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetTimeSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetTimeSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetTransitionActorListFactory : public SceneCommandFactoryBinaryV0 {
class SetTransitionActorListFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetTransitionActorListFactoryXML : public SceneCommandFactoryXMLV0 {
class SetTransitionActorListFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

4
soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.h
View file

@ -3,13 +3,13 @@
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
namespace SOH {
class SetWindSettingsFactory : public SceneCommandFactoryBinaryV0 {
class SetWindSettingsFactory final : public SceneCommandFactoryBinaryV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
std::shared_ptr<Ship::BinaryReader> reader) override;
};
class SetWindSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
class SetWindSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
public:
std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
tinyxml2::XMLElement* reader) override;

2
soh/soh/resource/type/scenecommand/SetLightList.h
View file

@ -35,7 +35,7 @@ typedef struct {
/* 0x2 */ LightParams params;
} LightInfo; // size = 0xE
class SetLightList : public SceneCommand<LightInfo> {
class SetLightList final : public SceneCommand<LightInfo> {
public:
using SceneCommand::SceneCommand;

2
soh/soh/resource/type/scenecommand/SetLightingSettings.h
View file

@ -19,7 +19,7 @@ typedef struct {
/* 0x14 */ s16 fogFar;
} EnvLightSettings; // size = 0x16
class SetLightingSettings : public SceneCommand<EnvLightSettings> {
class SetLightingSettings final : public SceneCommand<EnvLightSettings> {
public:
using SceneCommand::SceneCommand;