A couple of small fixes (#798)

TheAssemblyArmada · Nov 16, 2022 · 3e39884 · 3e39884
1 parent 29d0a2e
commit 3e39884
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/game/common/modules/modulefactory.h b/src/game/common/modules/modulefactory.h
@@ -34,11 +34,13 @@ typedef ModuleData *(*moddatacreateproc_t)(INI *);
 class ModuleFactory : public SubsystemInterface, public SnapShot
 {
     ALLOW_HOOKING
-    struct ModuleTemplate
+    class ModuleTemplate
     {
+    public:
         modcreateproc_t create_proc;
         moddatacreateproc_t create_data_proc;
         int which_interfaces;
+        ModuleTemplate() : create_proc(nullptr), create_data_proc(nullptr), which_interfaces(0) {}
     };
 
 public:

diff --git a/src/game/logic/object/update/aiupdate.h b/src/game/logic/object/update/aiupdate.h
@@ -92,7 +92,7 @@ class AIUpdateModuleData : public UpdateModuleData
     static void Parse_Turret(INI *ini, void *formal, void *store, const void *user_data);
 
 private:
-    std::map<LocomotorSetType, LocomotorTemplate const *> m_locomotorTemplates;
+    std::map<LocomotorSetType, std::vector<LocomotorTemplate const *>> m_locomotorTemplates;
     TurretAIData *m_turretData[MAX_TURRETS];
     unsigned int m_moodAttackCheckRate;
     bool m_forbidPlayerCommands;

diff --git a/src/game/logic/scriptengine/scriptengine.h b/src/game/logic/scriptengine/scriptengine.h
@@ -223,10 +223,10 @@ class ScriptEngine : public SubsystemInterface, public SnapShot
     int m_fadeFramesHold;
     int m_fadeFramesDecrease;
     int m_objectCreationDestructionFrame;
-    std::map<Utf8String, unsigned> m_playerObjectCounts[16];
+    std::map<Utf8String, int> m_playerObjectCounts[MAX_PLAYER_COUNT];
     std::list<Utf8String> m_completedVideo;
-    std::list<std::pair<Utf8String, unsigned>> m_completedSpeech;
-    std::list<std::pair<Utf8String, unsigned>> m_completedAudio;
+    std::list<std::pair<Utf8String, unsigned int>> m_completedSpeech;
+    std::list<std::pair<Utf8String, unsigned int>> m_completedAudio;
     std::list<Utf8String> m_uiInteraction;
     std::list<std::pair<Utf8String, ObjectID>> m_triggeredSpecialPowers[MAX_PLAYER_COUNT];
     std::list<std::pair<Utf8String, ObjectID>> m_midwaySpecialPowers[MAX_PLAYER_COUNT];