Add some script loaders

Editor/ProjectResourceFactoryBase.hpp

@@ -98,6 +98,12 @@ public:
     void AsyncIdle();
     void Shutdown() {CancelBackgroundIndex();}
 
+    SObjectTag TagFromPath(const hecl::SystemChar* path) const
+    {
+        return TagFromPath(hecl::ProjectPath(*(hecl::Database::Project*)m_proj, path),
+                           hecl::SharedBlenderToken);
+    }
+
     ~ProjectResourceFactoryBase() {Shutdown();}
 };
 

Runtime/CStateManager.cpp

@@ -38,7 +38,7 @@ CStateManager::CStateManager(const std::weak_ptr<CScriptMailbox>&,
 {
     x904_loaderFuncs[int(EScriptObjectType::Actor)] = ScriptLoader::LoadActor;
     x904_loaderFuncs[int(EScriptObjectType::Waypoint)] = ScriptLoader::LoadWaypoint;
-    x904_loaderFuncs[int(EScriptObjectType::DoorArea)] = ScriptLoader::LoadDoorArea;
+    x904_loaderFuncs[int(EScriptObjectType::DoorArea)] = ScriptLoader::LoadDoor;
     x904_loaderFuncs[int(EScriptObjectType::Trigger)] = ScriptLoader::LoadTrigger;
     x904_loaderFuncs[int(EScriptObjectType::Timer)] = ScriptLoader::LoadTimer;
     x904_loaderFuncs[int(EScriptObjectType::Counter)] = ScriptLoader::LoadCounter;

Runtime/CWeaponMgr.hpp

@@ -6,6 +6,22 @@ namespace urde
 
 enum class EWeaponType
 {
+    None = -1,
+    Power = 0,
+    Ice,
+    Wave,
+    Plasma,
+    Bomb,
+    PowerBomb,
+    Missile,
+    BoostBall,
+    Phazon,
+    AI,
+    PoisonWater,
+    Lava,
+    Hot,
+    Unused1,
+    Unused2
 };
 
 class CWeaponMgr

Runtime/Character/CModelData.hpp

@@ -23,17 +23,17 @@ struct SAdvancementDeltas;
 
 struct CStaticRes
 {
-    ResId x0_cmdlId;
+    ResId x0_cmdlId = 0;
     zeus::CVector3f x4_scale;
 };
 
 struct CAnimRes
 {
-    ResId x0_ancsId;
+    ResId x0_ancsId = 0;
-    s32 x4_charIdx;
+    s32 x4_charIdx = 0;
     zeus::CVector3f x8_scale;
-    bool x14_;
+    bool x14_ = false;
-    s32 x1c_defaultAnim;
+    s32 x1c_defaultAnim = 0;
 };
 
 class CModelData
@@ -68,7 +68,7 @@ public:
     CModelData(CModelData&&) = default;
     CModelData& operator=(CModelData&&) = default;
     CModelData();
-    CModelData CModelDataNull();
+    static CModelData CModelDataNull();
 
     SAdvancementDeltas GetAdvancementDeltas(const CCharAnimTime& a, const CCharAnimTime& b) const;
     void Render(const CStateManager& stateMgr, const zeus::CTransform& xf,

Runtime/Collision/CMaterialList.hpp

@@ -8,9 +8,8 @@ namespace urde
 
 class CMaterialList
 {
-    friend class ScriptLoader;
-    u64 x0_ = 0;
 public:
+    u64 x0_ = 0;
     CMaterialList() = default;
     CMaterialList(int idx) : x0_(1 << idx) {}
 };

Runtime/World/CDamageInfo.hpp

@@ -0,0 +1,42 @@
+#ifndef __URDE_CDAMAGEINFO_HPP__
+#define __URDE_CDAMAGEINFO_HPP__
+
+#include "RetroTypes.hpp"
+#include "CWeaponMgr.hpp"
+
+namespace urde
+{
+
+class CDamageInfo
+{
+    EWeaponType x0_type = EWeaponType::None;
+    union
+    {
+        struct
+        {
+            bool x4_24_ : 1;
+            bool x4_25_ : 1;
+            bool x4_26_ : 1;
+        };
+        u8 _dummy = 0;
+    };
+    float x8_damage1;
+    float xc_damage2;
+    float x10_radius;
+    float x14_knockback;
+    bool x18_ = false;
+public:
+    CDamageInfo(CInputStream& in)
+    {
+        in.readUint32Big();
+        x0_type = EWeaponType(in.readUint32Big());
+        x8_damage1 = in.readFloatBig();
+        xc_damage2 = x8_damage1;
+        x10_radius = in.readFloatBig();
+        x14_knockback = in.readFloatBig();
+    }
+};
+
+}
+
+#endif // __URDE_CDAMAGEINFO_HPP__

Runtime/World/CMakeLists.txt

@@ -17,10 +17,15 @@ add_library(RuntimeCommonWorld
             CScriptWater.hpp CScriptWater.cpp
             CScriptActor.hpp CScriptActor.cpp
             CScriptWaypoint.hpp CScriptWaypoint.cpp
+            CScriptDoor.hpp CScriptDoor.cpp
+            CScriptTrigger.hpp CScriptTrigger.cpp
+            CScriptTimer.hpp CScriptTimer.cpp
+            CScriptCounter.hpp CScriptCounter.cpp
             CGrappleParameters.hpp
             CActorParameters.hpp
             CLightParameters.hpp
             CScannableParameters.hpp
             CVisorParameters.hpp
             CAnimationParameters.hpp
+            CDamageInfo.hpp
             CDamageVulnerability.hpp)

Runtime/World/CScriptCounter.cpp

@@ -0,0 +1,12 @@
+#include "CScriptCounter.hpp"
+
+namespace urde
+{
+
+CScriptCounter::CScriptCounter(TUniqueId uid, const std::string& name, const CEntityInfo& info,
+                               u32, u32, bool, bool active)
+: CEntity(uid, info, active)
+{
+}
+
+}

Runtime/World/CScriptCounter.hpp

@@ -0,0 +1,19 @@
+#ifndef __URDE_CSCRIPTCOUNTER_HPP__
+#define __URDE_CSCRIPTCOUNTER_HPP__
+
+#include "CEntity.hpp"
+
+namespace urde
+{
+
+class CScriptCounter : public CEntity
+{
+public:
+    CScriptCounter(TUniqueId, const std::string& name, const CEntityInfo& info,
+                   u32, u32, bool, bool);
+    virtual void Accept(IVisitor&);
+};
+
+}
+
+#endif // __URDE_CSCRIPTCOUNTER_HPP__

Runtime/World/CScriptDoor.cpp

@@ -0,0 +1,36 @@
+#include "CScriptDoor.hpp"
+#include "Collision/CMaterialList.hpp"
+
+namespace urde
+{
+
+static CMaterialList MakeDoorMaterialList(bool material)
+{
+    CMaterialList ret;
+    if (material)
+    {
+        ret.x0_ |= 1ull << 19;
+        ret.x0_ |= 1ull << 43;
+        ret.x0_ |= 1ull << 41;
+    }
+    else
+    {
+        ret.x0_ |= 1ull << 43;
+        ret.x0_ |= 1ull << 42;
+        ret.x0_ |= 1ull << 19;
+        ret.x0_ |= 1ull << 41;
+    }
+    return ret;
+}
+
+CScriptDoor::CScriptDoor(TUniqueId uid, const std::string& name, const CEntityInfo& info,
+                         const zeus::CTransform& xf, const CModelData& mData, const CActorParameters& actParms,
+                         const zeus::CVector3f&, const zeus::CAABox& aabb, bool active,
+                         bool material, bool, float, bool ballDoor)
+: CPhysicsActor(uid, active, name, info, xf, mData, MakeDoorMaterialList(material),
+                aabb, SMoverData(1.f), actParms, 0.3f, 0.1f)
+{
+
+}
+
+}

Runtime/World/CScriptDoor.hpp

@@ -0,0 +1,20 @@
+#ifndef __URDE_CSCRIPTDOOR_HPP__
+#define __URDE_CSCRIPTDOOR_HPP__
+
+#include "CPhysicsActor.hpp"
+
+namespace urde
+{
+
+class CScriptDoor : public CPhysicsActor
+{
+public:
+    CScriptDoor(TUniqueId, const std::string& name, const CEntityInfo& info,
+                const zeus::CTransform&, const CModelData&, const CActorParameters&,
+                const zeus::CVector3f&, const zeus::CAABox&,
+                bool active, bool material, bool, float, bool ballDoor);
+};
+
+}
+
+#endif // __URDE_CSCRIPTDOOR_HPP__

Runtime/World/CScriptTimer.cpp

@@ -0,0 +1,12 @@
+#include "CScriptTimer.hpp"
+
+namespace urde
+{
+
+CScriptTimer::CScriptTimer(TUniqueId uid, const std::string& name, const CEntityInfo& info,
+                           float, float, bool, bool, bool active)
+: CEntity(uid, info, active)
+{
+}
+
+}

Runtime/World/CScriptTimer.hpp

@@ -0,0 +1,19 @@
+#ifndef __URDE_CSCRIPTIMER_HPP__
+#define __URDE_CSCRIPTIMER_HPP__
+
+#include "CEntity.hpp"
+
+namespace urde
+{
+
+class CScriptTimer : public CEntity
+{
+public:
+    CScriptTimer(TUniqueId, const std::string& name, const CEntityInfo& info,
+                 float, float, bool, bool, bool);
+    virtual void Accept(IVisitor&);
+};
+
+}
+
+#endif // __URDE_CSCRIPTIMER_HPP__

Runtime/World/CScriptTrigger.cpp

@@ -0,0 +1,18 @@
+#include "CScriptTrigger.hpp"
+#include "Character/CModelData.hpp"
+#include "CActorParameters.hpp"
+#include "Collision/CMaterialList.hpp"
+
+namespace urde
+{
+
+CScriptTrigger::CScriptTrigger(TUniqueId uid, const std::string& name, const CEntityInfo& info,
+                               const zeus::CVector3f& pos, const zeus::CAABox&,
+                               const CDamageInfo& dInfo, const zeus::CVector3f& orientedForce,
+                               u32, bool active, bool, bool)
+: CActor(uid, active, name, info, zeus::CTransform::Translate(pos), CModelData::CModelDataNull(),
+         CMaterialList(34), CActorParameters::None(), kInvalidUniqueId)
+{
+}
+
+}

Runtime/World/CScriptTrigger.hpp

@@ -0,0 +1,21 @@
+#ifndef __URDE_CSCRIPTTRIGGER_HPP__
+#define __URDE_CSCRIPTTRIGGER_HPP__
+
+#include "CActor.hpp"
+
+namespace urde
+{
+class CDamageInfo;
+
+class CScriptTrigger : public CActor
+{
+public:
+    CScriptTrigger(TUniqueId, const std::string& name, const CEntityInfo& info,
+                   const zeus::CVector3f& pos, const zeus::CAABox&,
+                   const CDamageInfo& dInfo, const zeus::CVector3f& orientedForce,
+                   u32, bool, bool, bool);
+};
+
+}
+
+#endif // __URDE_CSCRIPTTRIGGER_HPP__

Runtime/World/ScriptLoader.cpp

@@ -10,14 +10,30 @@
 #include "CWorld.hpp"
 #include "Character/CModelData.hpp"
 #include "Collision/CMaterialList.hpp"
+#include "CDamageInfo.hpp"
 #include "CScriptActor.hpp"
 #include "CScriptWaypoint.hpp"
+#include "CScriptDoor.hpp"
+#include "CScriptTrigger.hpp"
+#include "CScriptTimer.hpp"
+#include "CScriptCounter.hpp"
+#include "CSimplePool.hpp"
+#include "Editor/ProjectResourceFactoryMP1.hpp"
 #include "logvisor/logvisor.hpp"
 
 namespace urde
 {
 static logvisor::Module Log("urde::ScriptLoader");
 
+static SObjectTag MorphballDoorANCS = {};
+static const SObjectTag& GetMorphballDoorANCS()
+{
+    if (!MorphballDoorANCS)
+        MorphballDoorANCS = static_cast<ProjectResourceFactoryBase*>(g_ResFactory)->
+            TagFromPath(_S("MP1/Shared/ANCS_1F9DA858.blend"));
+    return MorphballDoorANCS;
+}
+
 static bool EnsurePropertyCount(int count, int expected, const char* structName)
 {
     if (count < expected)
@@ -220,18 +236,18 @@ CLightParameters ScriptLoader::LoadLightParameters(CInputStream& in)
 
         s32 w1 = -1;
         s32 w2 = -1;
-        if (propCount >= 0xc)
+        if (propCount >= 12)
         {
             w1 = in.readUint32Big();
             w2 = in.readUint32Big();
         }
 
         bool b1 = false;
-        if (propCount >= 0xd)
+        if (propCount >= 13)
             b1 = in.readBool();
 
         s32 w3 = 0;
-        if (propCount >= 0xe)
+        if (propCount >= 14)
             w3 = in.readUint32Big();
 
         return CLightParameters(a, b, c, d, e, col, f, g, h, vec, w1, w2, b1, w3);
@@ -332,7 +348,7 @@ CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in,
         data = sRes;
     }
 
-    if (collisionExtent.isZero() || generateExtent)
+    if (generateExtent || collisionExtent.isZero())
         aabb = data.GetBounds(head.x10_transform.getRotation());
 
     return new CScriptActor(mgr.AllocateUniqueId(), head.x0_name, info,
@@ -363,503 +379,724 @@ CEntity* ScriptLoader::LoadWaypoint(CStateManager& mgr, CInputStream& in,
                                b1, f1, f2, w1, w2, w3, w4, w5, w6, w7);
 }
 
-CEntity* ScriptLoader::LoadDoorArea(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDoor(CStateManager& mgr, CInputStream& in,
+                                int propCount, const CEntityInfo& info)
 {
+    if (!EnsurePropertyCount(propCount, 13, "Door") || propCount > 14)
+        return nullptr;
+
+    SScaledActorHead head = LoadScaledActorHead(in, mgr);
+    CAnimationParameters aParms = LoadAnimationParameters(in);
+    CActorParameters actParms = LoadActorParameters(in);
+
+    zeus::CVector3f v1;
+    v1.readBig(in);
+    zeus::CVector3f collisionExtent;
+    collisionExtent.readBig(in);
+    zeus::CVector3f offset;
+    offset.readBig(in);
+
+    bool b1 = in.readBool();
+    bool b2 = in.readBool();
+    bool b3 = in.readBool();
+    float f1 = in.readFloatBig();
+
+    zeus::CAABox aabb = GetCollisionBox(mgr, info.GetAreaId(), collisionExtent, offset);
+
+    if (!g_ResFactory->GetResourceTypeById(aParms.x0_ancs))
+        return nullptr;
+
+    CAnimRes aRes;
+    aRes.x0_ancsId = aParms.x0_ancs;
+    aRes.x4_charIdx = aParms.x4_charIdx;
+    aRes.x1c_defaultAnim = aParms.x8_defaultAnim;
+    aRes.x8_scale = head.x40_scale;
+
+    CModelData mData = aRes;
+    if (collisionExtent.isZero())
+        aabb = mData.GetBounds(head.x10_transform.getRotation());
+
+    bool isMorphballDoor = false;
+    if (propCount == 13)
+    {
+        if (aParms.x0_ancs == GetMorphballDoorANCS().id)
+            isMorphballDoor = true;
+    }
+    else if (propCount == 14)
+        isMorphballDoor = in.readBool();
+
+    return new CScriptDoor(mgr.AllocateUniqueId(), head.x0_name, info, head.x10_transform,
+                           mData, actParms, v1, aabb, b1, b2, b3, f1, isMorphballDoor);
 }
 
-CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in,
+                                   int propCount, const CEntityInfo& info)
 {
+    if (!EnsurePropertyCount(propCount, 9, "Trigger"))
+        return nullptr;
+
+    const std::string* name = mgr.HashInstanceName(in);
+
+    zeus::CVector3f position;
+    position.readBig(in);
+
+    zeus::CVector3f extent;
+    extent.readBig(in);
+
+    CDamageInfo dInfo(in);
+
+    zeus::CVector3f forceVec;
+    forceVec.readBig(in);
+
+    u32 w1 = in.readUint32Big();
+    bool b1 = in.readBool();
+    bool b2 = in.readBool();
+    bool b3 = in.readBool();
+
+    zeus::CAABox box(-extent * 0.5f, extent * 0.5f);
+
+    zeus::CTransform areaXf = mgr.GetWorld()->GetGameAreas()[info.GetAreaId()]->GetTransform();
+    zeus::CVector3f orientedForce = areaXf.m_basis * forceVec;
+
+    return new CScriptTrigger(mgr.AllocateUniqueId(), *name, info, position, box, dInfo,
+                              orientedForce, w1, b1, b2, b3);
 }
 
-CEntity* ScriptLoader::LoadTimer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTimer(CStateManager& mgr, CInputStream& in,
+                                 int propCount, const CEntityInfo& info)
 {
+    if (!EnsurePropertyCount(propCount, 6, "Timer"))
+        return nullptr;
+
+    const std::string* name = mgr.HashInstanceName(in);
+
+    float f1 = in.readFloatBig();
+    float f2 = in.readFloatBig();
+    bool b1 = in.readBool();
+    bool b2 = in.readBool();
+    bool b3 = in.readBool();
+
+    return new CScriptTimer(mgr.AllocateUniqueId(), *name, info, f1, f2, b1, b2, b3);
 }
 
-CEntity* ScriptLoader::LoadCounter(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCounter(CStateManager& mgr, CInputStream& in,
+                                   int propCount, const CEntityInfo& info)
 {
+    if (!EnsurePropertyCount(propCount, 5, "Counter"))
+        return nullptr;
+
+    const std::string* name = mgr.HashInstanceName(in);
+
+    u32 w1 = in.readUint32Big();
+    u32 w2 = in.readUint32Big();
+    bool b1 = in.readBool();
+    bool b2 = in.readBool();
+
+    return new CScriptCounter(mgr.AllocateUniqueId(), *name, info, w1, w2, b1, b2);
 }
 
-CEntity* ScriptLoader::LoadEffect(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEffect(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSound(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSound(CStateManager& mgr, CInputStream& in,
+                                 int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGenerator(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGenerator(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDock(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDock(CStateManager& mgr, CInputStream& in,
+                                int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCamera(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraWaypoint(CStateManager& mgr, CInputStream& in,
+                                          int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadNewIntroBoss(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadNewIntroBoss(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpawnPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpawnPoint(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraHint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraHint(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPickup(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPickup(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMemoryRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMemoryRelay(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRandomRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRandomRelay(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRelay(CStateManager& mgr, CInputStream& in,
+                                 int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBeetle(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBeetle(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadHUDMemo(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadHUDMemo(CStateManager& mgr, CInputStream& in,
+                                   int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream& in,
+                                                int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraBlurKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraBlurKeyframe(CStateManager& mgr, CInputStream& in,
+                                              int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDamageableTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDamageableTrigger(CStateManager& mgr, CInputStream& in,
+                                             int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDebris(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDebris(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraShaker(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraShaker(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadActorKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadActorKeyframe(CStateManager& mgr, CInputStream& in,
+                                         int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in,
+                                 int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWarwasp(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWarwasp(CStateManager& mgr, CInputStream& in,
+                                   int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpacePirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpacePirate(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlyingPirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlyingPirate(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadElitePirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadElitePirate(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidBeta(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidBeta(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadChozoGhost(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadChozoGhost(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCoverPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCoverPoint(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpiderBallWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpiderBallWaypoint(CStateManager& mgr, CInputStream& in,
+                                              int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBloodFlower(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBloodFlower(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlickerBat(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlickerBat(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPathCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPathCamera(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGrapplePoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGrapplePoint(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPuddleSpore(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPuddleSpore(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDebugCameraWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDebugCameraWaypoint(CStateManager& mgr, CInputStream& in,
+                                               int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpiderBallAttractionSurface(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpiderBallAttractionSurface(CStateManager& mgr, CInputStream& in,
+                                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPuddleToadGamma(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPuddleToadGamma(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDistanceFog(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDistanceFog(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFireFlea(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFireFlea(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetareeAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetareeAlpha(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDockAreaChange(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDockAreaChange(CStateManager& mgr, CInputStream& in,
+                                          int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadActorRotate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadActorRotate(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpecialFunction(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpecialFunction(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpankWeed(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpankWeed(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadParasite(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadParasite(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlayerHint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlayerHint(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRipper(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRipper(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPickupGenerator(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPickupGenerator(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAIKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAIKeyframe(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPointOfInterest(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPointOfInterest(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDrone(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDrone(CStateManager& mgr, CInputStream& in,
+                                 int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidAlpha(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDebrisExtended(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDebrisExtended(CStateManager& mgr, CInputStream& in,
+                                          int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSteam(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSteam(CStateManager& mgr, CInputStream& in,
+                                 int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRipple(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRipple(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBallTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBallTrigger(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTargetingPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTargetingPoint(CStateManager& mgr, CInputStream& in,
+                                          int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEMPulse(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEMPulse(CStateManager& mgr, CInputStream& in,
+                                   int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadIceSheegoth(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadIceSheegoth(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlayerActor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlayerActor(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlaahgra(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlaahgra(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAreaAttributes(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAreaAttributes(CStateManager& mgr, CInputStream& in,
+                                          int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFishCloud(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFishCloud(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFishCloudModifier(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFishCloudModifier(CStateManager& mgr, CInputStream& in,
+                                             int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadVisorFlare(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadVisorFlare(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWorldTeleporter(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWorldTeleporter(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadVisorGoo(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadVisorGoo(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadJellyZap(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadJellyZap(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadControllerAction(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadControllerAction(CStateManager& mgr, CInputStream& in,
+                                            int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSwitch(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSwitch(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlayerStateChange(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlayerStateChange(CStateManager& mgr, CInputStream& in,
+                                             int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadThardus(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadThardus(CStateManager& mgr, CInputStream& in,
+                                   int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWallCrawlerSwarm(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWallCrawlerSwarm(CStateManager& mgr, CInputStream& in,
+                                            int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAIJumpPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAIJumpPoint(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlaahgraTentacle(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlaahgraTentacle(CStateManager& mgr, CInputStream& in,
+                                            int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRoomAcoustics(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRoomAcoustics(CStateManager& mgr, CInputStream& in,
+                                         int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadColorModulate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadColorModulate(CStateManager& mgr, CInputStream& in,
+                                         int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadThardusRockProjectile(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadThardusRockProjectile(CStateManager& mgr, CInputStream& in,
+                                                 int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMidi(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMidi(CStateManager& mgr, CInputStream& in,
+                                int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadStreamedAudio(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadStreamedAudio(CStateManager& mgr, CInputStream& in,
+                                         int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRepulsor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRepulsor(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGunTurret(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGunTurret(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFogVolume(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFogVolume(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBabygoth(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBabygoth(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEyeball(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEyeball(CStateManager& mgr, CInputStream& in,
+                                   int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRadialDamage(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRadialDamage(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraPitchVolume(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraPitchVolume(CStateManager& mgr, CInputStream& in,
+                                             int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEnvFxDensityController(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEnvFxDensityController(CStateManager& mgr, CInputStream& in,
+                                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMagdolite(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMagdolite(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTeamAIMgr(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTeamAIMgr(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSnakeWeedSwarm(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSnakeWeedSwarm(CStateManager& mgr, CInputStream& in,
+                                          int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::Load(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::Load(CStateManager& mgr, CInputStream& in,
+                            int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadActorContraption(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadActorContraption(CStateManager& mgr, CInputStream& in,
+                                            int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadOculus(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadOculus(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGeemer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGeemer(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpindleCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpindleCamera(CStateManager& mgr, CInputStream& in,
+                                         int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAtomicAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAtomicAlpha(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraHintTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraHintTrigger(CStateManager& mgr, CInputStream& in,
+                                             int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRumbleEffect(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRumbleEffect(CStateManager& mgr, CInputStream& in,
+                                        int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAmbientAI(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAmbientAI(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAtomicBeta(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAtomicBeta(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadIceZoomer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadIceZoomer(CStateManager& mgr, CInputStream& in,
+                                     int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPuffer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPuffer(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTryclops(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTryclops(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRidley(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRidley(CStateManager& mgr, CInputStream& in,
+                                  int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSeedling(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSeedling(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadThermalHeatFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadThermalHeatFader(CStateManager& mgr, CInputStream& in,
+                                            int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBurrower(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBurrower(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadScriptBeam(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadScriptBeam(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWorldLightFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWorldLightFader(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidPrimeStage2(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidPrimeStage2(CStateManager& mgr, CInputStream& in,
+                                              int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidPrimeStage1(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidPrimeStage1(CStateManager& mgr, CInputStream& in,
+                                              int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMazeNode(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMazeNode(CStateManager& mgr, CInputStream& in,
+                                    int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadOmegaPirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadOmegaPirate(CStateManager& mgr, CInputStream& in,
+                                       int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPhazonPool(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPhazonPool(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPhazonHealingNodule(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPhazonHealingNodule(CStateManager& mgr, CInputStream& in,
+                                               int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadNewCameraShaker(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadNewCameraShaker(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadShadowProjector(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadShadowProjector(CStateManager& mgr, CInputStream& in,
+                                           int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in,
+                                      int propCount, const CEntityInfo& info)
 {
 }
 

Runtime/World/ScriptLoader.hpp

@@ -34,7 +34,7 @@ public:
 
     static CEntity* LoadActor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
     static CEntity* LoadWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
-    static CEntity* LoadDoorArea(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDoor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
     static CEntity* LoadTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
     static CEntity* LoadTimer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
     static CEntity* LoadCounter(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);