Fix warnings (#5516)

* use size_t instead of uint8_t for hint ids

* va_arg int instead of s16

warning: second argument to 'va_arg' is of promotable type 's16' (aka 'short'); this va_arg has undefined behavior because arguments will be promoted to 'int' [-Wvarargs]

* more issues like #5443

soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp

@@ -77,9 +77,9 @@ void CrawlSpeed_Register() {
     COND_VB_SHOULD(VB_CRAWL_SPEED_EXIT_CS, shouldRegister, {
         Player* player = GET_PLAYER(gPlayState);
         Camera* csCam = va_arg(args, Camera*);
-        s16 csId = va_arg(args, s16);
+        s16 csId = static_cast<s16>(va_arg(args, int));
-        s16 actionParameters = va_arg(args, s16);
+        s16 actionParameters = static_cast<s16>(va_arg(args, int));
-        s16 initTimer = va_arg(args, s16);
+        s16 initTimer = static_cast<s16>(va_arg(args, int));
         CutsceneCameraPoint* atPoints = va_arg(args, CutsceneCameraPoint*);
         CutsceneCameraPoint* eyePoints = va_arg(args, CutsceneCameraPoint*);
         bool excludeWellBackroom = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) &&

soh/soh/Enhancements/randomizer/3drando/hints.cpp

@@ -40,7 +40,7 @@ const CustomMessage& HintText::GetObscure() const {
     return obscureText.size() > 0 ? RandomElement(obscureText) : clearText;
 }
 
-const CustomMessage& HintText::GetObscure(uint8_t selection) const {
+const CustomMessage& HintText::GetObscure(size_t selection) const {
     if (obscureText.size() > selection) {
         return obscureText[selection];
     } else if (obscureText.size() > 0) {
@@ -53,7 +53,7 @@ const CustomMessage& HintText::GetAmbiguous() const {
     return ambiguousText.size() > 0 ? RandomElement(ambiguousText) : clearText;
 }
 
-const CustomMessage& HintText::GetAmbiguous(uint8_t selection) const {
+const CustomMessage& HintText::GetAmbiguous(size_t selection) const {
     if (ambiguousText.size() > selection) {
         return ambiguousText[selection];
     } else if (ambiguousText.size() > 0) {
@@ -62,15 +62,15 @@ const CustomMessage& HintText::GetAmbiguous(uint8_t selection) const {
     return clearText;
 }
 
-uint8_t HintText::GetAmbiguousSize() const {
+size_t HintText::GetAmbiguousSize() const {
-    return static_cast<uint8_t>(ambiguousText.size());
+    return ambiguousText.size();
 }
 
-uint8_t HintText::GetObscureSize() const {
+size_t HintText::GetObscureSize() const {
-    return static_cast<uint8_t>(obscureText.size());
+    return obscureText.size();
 }
 
-const CustomMessage& HintText::GetHintMessage(uint8_t selection) const {
+const CustomMessage& HintText::GetHintMessage(size_t selection) const {
     auto ctx = Rando::Context::GetInstance();
     if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)) {
         return GetObscure(selection);

soh/soh/Enhancements/randomizer/3drando/hints.hpp

@@ -37,12 +37,12 @@ class HintText {
              std::vector<CustomMessage> obscureText_ = {});
     const CustomMessage& GetClear() const;
     const CustomMessage& GetObscure() const;
-    const CustomMessage& GetObscure(uint8_t selection) const;
+    const CustomMessage& GetObscure(size_t selection) const;
     const CustomMessage& GetAmbiguous() const;
-    const CustomMessage& GetAmbiguous(uint8_t selection) const;
+    const CustomMessage& GetAmbiguous(size_t selection) const;
-    uint8_t GetAmbiguousSize() const;
+    size_t GetAmbiguousSize() const;
-    uint8_t GetObscureSize() const;
+    size_t GetObscureSize() const;
-    const CustomMessage& GetHintMessage(uint8_t selection = 0) const;
+    const CustomMessage& GetHintMessage(size_t selection = 0) const;
     const CustomMessage GetMessageCopy() const;
     bool operator==(const HintText& right) const;
     bool operator!=(const HintText& right) const;

soh/soh/Enhancements/randomizer/hint.cpp

@@ -174,8 +174,8 @@ void Hint::NamesChosen() {
     auto ctx = Rando::Context::GetInstance();
     std::vector<uint8_t> namesTemp = {};
     bool saveNames = false;
-    uint8_t numMessages = GetNumberOfMessages();
+    size_t numMessages = GetNumberOfMessages();
-    for (uint8_t c = 0; c < numMessages; c++) {
+    for (size_t c = 0; c < numMessages; c++) {
         uint8_t selection = GetRandomHintTextEntry(GetHintText(c));
         if (selection > 0) {
             saveNames = true;
@@ -187,7 +187,7 @@ void Hint::NamesChosen() {
     }
 
     if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA) {
-        for (uint8_t c = 0; c < locations.size(); c++) {
+        for (size_t c = 0; c < locations.size(); c++) {
             namesTemp = {};
             saveNames = false;
             uint8_t selection = GetRandomHintTextEntry(GetItemHintText(c));
@@ -218,7 +218,7 @@ void Hint::NamesChosen() {
     }
 }
 
-uint8_t Hint::GetNumberOfMessages() const {
+size_t Hint::GetNumberOfMessages() const {
     size_t numMessages = std::max(messages.size(), hintKeys.size());
     if (StaticData::staticHintInfoMap.contains(ownKey)) {
         numMessages = std::max(StaticData::staticHintInfoMap[ownKey].hintKeys.size(), numMessages);
@@ -226,20 +226,19 @@ uint8_t Hint::GetNumberOfMessages() const {
     if (numMessages == 0) {
         numMessages = 1; // RANDOTODO make std::max actually fucking work for 3 arguments
     }
-    // RANDOTODO will number of messages always be u8?
+    return numMessages;
-    return static_cast<uint8_t>(numMessages);
 }
 
 const std::vector<std::string> Hint::GetAllMessageStrings(MessageFormat format) const {
     std::vector<std::string> hintMessages = {};
-    uint8_t numMessages = GetNumberOfMessages();
+    size_t numMessages = GetNumberOfMessages();
-    for (int c = 0; c < numMessages; c++) {
+    for (size_t c = 0; c < numMessages; c++) {
         hintMessages.push_back(GetHintMessage(format, c).GetForCurrentLanguage(format));
     }
     return hintMessages;
 }
 
-const HintText Hint::GetHintText(uint8_t id) const {
+const HintText Hint::GetHintText(size_t id) const {
     auto ctx = Rando::Context::GetInstance();
     if (hintKeys.size() > id) {
         return StaticData::hintTextTable[hintKeys[id]];
@@ -284,11 +283,11 @@ const HintText Hint::GetHintText(uint8_t id) const {
     }
 }
 
-const CustomMessage Hint::GetHintMessage(MessageFormat format, uint8_t id) const {
+const CustomMessage Hint::GetHintMessage(MessageFormat format, size_t id) const {
     auto ctx = Rando::Context::GetInstance();
     CustomMessage hintText = CustomMessage("");
 
-    uint8_t chosenMessage = 0;
+    size_t chosenMessage = 0;
     if (hintTextsChosen.size() > id) {
         chosenMessage = id;
     }

soh/soh/Enhancements/randomizer/hint.h

@@ -23,10 +23,10 @@ class Hint {
     void FillGapsInData();
     void SetLocationsAsHinted() const;
     void NamesChosen();
-    uint8_t GetNumberOfMessages() const;
+    size_t GetNumberOfMessages() const;
     const std::vector<std::string> GetAllMessageStrings(MessageFormat format = MF_AUTO_FORMAT) const;
-    const CustomMessage GetHintMessage(MessageFormat format = MF_AUTO_FORMAT, uint8_t id = 0) const;
+    const CustomMessage GetHintMessage(MessageFormat format = MF_AUTO_FORMAT, size_t id = 0) const;
-    const HintText GetHintText(uint8_t id = 0) const;
+    const HintText GetHintText(size_t id = 0) const;
     oJson toJSON();
     void logHint(oJson& jsonData);
     const HintText GetItemHintText(uint8_t slot, bool mysterious = false) const;

soh/soh/config/ConfigUpdaters.h

@@ -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);

soh/soh/resource/importer/AnimationFactory.h

@@ -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;

soh/soh/resource/importer/ArrayFactory.h

@@ -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;

soh/soh/resource/importer/AudioSampleFactory.h

@@ -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;

soh/soh/resource/importer/AudioSequenceFactory.cpp

@@ -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();
     }
 

soh/soh/resource/importer/AudioSequenceFactory.h

@@ -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;

soh/soh/resource/importer/AudioSoundFontFactory.h

@@ -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;

soh/soh/resource/importer/BackgroundFactory.h

@@ -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;

soh/soh/resource/importer/CollisionHeaderFactory.h

@@ -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;

soh/soh/resource/importer/CutsceneFactory.h

@@ -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;

soh/soh/resource/importer/PathFactory.h

@@ -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;

soh/soh/resource/importer/PlayerAnimationFactory.h

@@ -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;

soh/soh/resource/importer/SceneFactory.h

@@ -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();
 

soh/soh/resource/importer/SkeletonFactory.cpp

@@ -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);

soh/soh/resource/importer/SkeletonFactory.h

@@ -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;

soh/soh/resource/importer/SkeletonLimbFactory.h

@@ -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;

soh/soh/resource/importer/TextFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/EndMarkerFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetActorListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetCsCameraFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetCutscenesFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetEntranceListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetExitListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetLightListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetMeshFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetObjectListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetPathwaysFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetRoomListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.h

@@ -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;

soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.h

@@ -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;

soh/soh/resource/type/scenecommand/SetLightList.h

@@ -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;
 

soh/soh/resource/type/scenecommand/SetLightingSettings.h

@@ -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;