Various windows compile fixes

This commit is contained in:
Phillip 2016-05-20 20:02:09 -07:00
parent 27bee1cc35
commit a3b47df10d
32 changed files with 215 additions and 43 deletions

View File

@ -201,6 +201,7 @@ void CStateManager::UpdateEscapeSequenceTimer(float)
float CStateManager::GetEscapeSequenceTimer() const
{
return 0.f;
}
void CStateManager::ResetEscapeSequenceTimer(float)
@ -217,6 +218,7 @@ void CStateManager::MurderScriptInstanceNames()
const std::string* CStateManager::HashInstanceName(CInputStream& in)
{
return nullptr;
}
void CStateManager::SetActorAreaId(CActor& actor, TAreaId)
@ -241,10 +243,12 @@ void CStateManager::CacheReflection()
bool CStateManager::CanCreateProjectile(TUniqueId, EWeaponType, int) const
{
return false;
}
const CGameLightList* CStateManager::GetDynamicLightList() const
{
return nullptr;
}
void CStateManager::BuildDynamicLightListForWorld(std::vector<CLight>& listOut) const
@ -302,10 +306,12 @@ void CStateManager::GetBuildForScript(TEditorId) const
TEditorId CStateManager::GetEditorIdForUniqueId(TUniqueId) const
{
return 0;
}
TUniqueId CStateManager::GetIdForScript(TEditorId) const
{
return 0;
}
void CStateManager::GetIdListForScript(TEditorId) const
@ -470,6 +476,7 @@ void CStateManager::UpdateSortedLists()
zeus::CAABox CStateManager::CalculateObjectBounds(const CActor&)
{
return {};
}
void CStateManager::AddObject(CEntity&, EScriptPersistence)
@ -483,12 +490,14 @@ void CStateManager::AddObject(CEntity*, EScriptPersistence)
bool CStateManager::RayStaticIntersection(const zeus::CVector3f&, const zeus::CVector3f&, float,
const CMaterialFilter&) const
{
return false;
}
bool CStateManager::RayWorldIntersection(TUniqueId, const zeus::CVector3f&, const zeus::CVector3f&,
float, const CMaterialFilter&,
const rstl::reserved_vector<TUniqueId, 1024>& list) const
{
return false;
}
void CStateManager::UpdateObjectInLists(CEntity&)
@ -497,6 +506,7 @@ void CStateManager::UpdateObjectInLists(CEntity&)
TUniqueId CStateManager::AllocateUniqueId()
{
return 0;
}
}

View File

@ -39,7 +39,7 @@ CAnimData::CAnimData(ResId id,
const std::shared_ptr<CAnimationManager>& animMgr,
const std::shared_ptr<CTransitionManager>& transMgr,
const TLockedToken<CCharacterFactory>& charFactory)
: x0_charFactory(charFactory),
: x0_charFactory(charFactory),
xc_charInfo(character),
xcc_layoutData(layout),
xd8_modelData(model),
@ -106,14 +106,17 @@ void CAnimData::UpdateAdditiveAnims(float)
bool CAnimData::IsAdditiveAnimation(u32) const
{
return false;
}
std::shared_ptr<CAnimTreeNode> CAnimData::GetAdditiveAnimationTree(u32) const
{
return {};
}
bool CAnimData::IsAdditiveAnimationActive(u32) const
{
return false;
}
void CAnimData::DelAdditiveAnimation(u32)
@ -126,6 +129,7 @@ void CAnimData::AddAdditiveAnimation(u32, float, bool, bool)
std::shared_ptr<CAnimationManager> CAnimData::GetAnimationManager()
{
return {};
}
void CAnimData::SetPhase(float)
@ -139,10 +143,12 @@ void CAnimData::Touch(const CSkinnedModel& model, int) const
SAdvancementDeltas CAnimData::GetAdvancementDeltas(const CCharAnimTime& a,
const CCharAnimTime& b) const
{
return {};
}
CCharAnimTime CAnimData::GetTimeOfUserEvent(EUserEventType, const CCharAnimTime& time) const
{
return {};
}
void CAnimData::MultiplyPlaybackRate(float)
@ -164,30 +170,37 @@ void CAnimData::CalcPlaybackAlignmentParms(const CAnimPlaybackParms& parms,
zeus::CTransform CAnimData::GetLocatorTransform(CSegId id, const CCharAnimTime* time) const
{
return {};
}
zeus::CTransform CAnimData::GetLocatorTransform(const std::string& name, const CCharAnimTime* time) const
{
return {};
}
bool CAnimData::IsAnimTimeRemaining(float, const std::string& name) const
{
return false;
}
float CAnimData::GetAnimTimeRemaining(const std::string& name) const
{
return 0.f;
}
float CAnimData::GetAnimationDuration(int) const
{
return 0.f;
}
std::shared_ptr<CAnimSysContext> CAnimData::GetAnimSysContext() const
{
return {};
}
std::shared_ptr<CAnimationManager> CAnimData::GetAnimationManager() const
{
return {};
}
void CAnimData::RecalcPoseBuilder(const CCharAnimTime*) const
@ -236,10 +249,12 @@ void CAnimData::DoAdvance(float, bool&, CRandom16&, bool)
SAdvancementDeltas CAnimData::Advance(float, const zeus::CVector3f&, CStateManager& stateMgr, bool)
{
return {};
}
SAdvancementDeltas CAnimData::AdvanceIgnoreParticles(float, CRandom16&, bool)
{
return {};
}
void CAnimData::AdvanceAnim(CCharAnimTime& time, zeus::CVector3f&, zeus::CQuaternion&)
@ -275,14 +290,17 @@ void CAnimData::ResetPOILists()
CSegId CAnimData::GetLocatorSegId(const std::string& name) const
{
return {};
}
zeus::CAABox CAnimData::GetBoundingBox(const zeus::CTransform& xf) const
{
return {};
}
zeus::CAABox CAnimData::GetBoundingBox() const
{
return {};
}
}

View File

@ -19,7 +19,7 @@ namespace urde
class CCharLayoutInfo;
class CSkinnedModel;
class CMorphableSkinnedModel;
class CAnimSysContext;
struct CAnimSysContext;
class CAnimationManager;
class CTransitionManager;
class CCharacterFactory;

View File

@ -11,58 +11,70 @@ CAnimTreeSingleChild::CAnimTreeSingleChild(const std::weak_ptr<CAnimTreeNode>& n
SAdvancementResults CAnimTreeSingleChild::VAdvanceView(const CCharAnimTime& a)
{
return {};
}
CCharAnimTime CAnimTreeSingleChild::VGetTimeRemaining() const
{
return {};
}
bool CAnimTreeSingleChild::VHasOffset(const CSegId& seg) const
{
return false;
}
zeus::CVector3f CAnimTreeSingleChild::VGetOffset(const CSegId& seg) const
{
return {};
}
zeus::CQuaternion CAnimTreeSingleChild::VGetRotation(const CSegId& seg) const
{
return {};
}
u32 CAnimTreeSingleChild::VGetBoolPOIList(const CCharAnimTime& time,
CBoolPOINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
u32 CAnimTreeSingleChild::VGetInt32POIList(const CCharAnimTime& time,
CInt32POINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
u32 CAnimTreeSingleChild::VGetParticlePOIList(const CCharAnimTime& time,
CParticlePOINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
u32 CAnimTreeSingleChild::VGetSoundPOIList(const CCharAnimTime& time,
CSoundPOINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
bool CAnimTreeSingleChild::VGetBoolPOIState(const char* name) const
{
return false;
}
s32 CAnimTreeSingleChild::VGetInt32POIState(const char* name) const
{
return -1;
}
CParticleData::EParentedMode CAnimTreeSingleChild::VGetParticlePOIState(const char* name) const
{
return CParticleData::EParentedMode::Initial;
}
void CAnimTreeSingleChild::VGetSegStatementSet(const CSegIdList& list,
@ -84,6 +96,7 @@ SAdvancementResults
CAnimTreeSingleChild::VGetAdvancementResults(const CCharAnimTime& a,
const CCharAnimTime& b) const
{
return {};
}
void CAnimTreeSingleChild::Depth() const
@ -92,6 +105,7 @@ void CAnimTreeSingleChild::Depth() const
u32 CAnimTreeSingleChild::VGetNumChildren() const
{
return 0;
}
}

View File

@ -0,0 +1,13 @@
#include "CAnimationManager.hpp"
#include "CAnimationDatabaseGame.hpp"
#include "CTransitionDatabaseGame.hpp"
namespace urde
{
const CAnimationDatabaseGame* CAnimationManager::GetAnimationDatabase() const
{
return x0_animDB.GetObj();
}
}

View File

@ -19,7 +19,7 @@ public:
const CAnimSysContext& sysCtx)
: x0_animDB(animDB), x8_sysCtx(sysCtx) {}
const CAnimationDatabaseGame* GetAnimationDatabase() const {return x0_animDB.GetObj();}
const CAnimationDatabaseGame* GetAnimationDatabase() const;
};
}

View File

@ -16,6 +16,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimBlend::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimBlend::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@ -26,6 +27,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimBlend::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@ -16,6 +16,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPhaseBlend::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimPhaseBlend::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@ -26,6 +27,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPhaseBlend::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@ -10,6 +10,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPlay::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimPlay::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@ -20,6 +21,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPlay::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@ -26,6 +26,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimRandom::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimRandom::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@ -36,6 +37,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimRandom::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@ -23,6 +23,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimSequence::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimSequence::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@ -33,6 +34,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimSequence::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@ -12,6 +12,7 @@ CMetaTransMetaAnim::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const
{
return {};
}
}

View File

@ -17,6 +17,7 @@ CMetaTransPhaseTrans::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const
{
return {};
}
}

View File

@ -18,7 +18,7 @@ CMetaTransTrans::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const
{
return {};
}
}

View File

@ -10,6 +10,9 @@ class CPASAnimParmData
s32 x0_stateId;
rstl::reserved_vector<CPASAnimParm,8> x4_parms;
public:
CPASAnimParmData()
{};
CPASAnimParmData(s32 stateId, const CPASAnimParm& parm1, const CPASAnimParm& parm2, const CPASAnimParm& parm3,
const CPASAnimParm& parm4, const CPASAnimParm& parm5, const CPASAnimParm& parm6, const CPASAnimParm& parm7,
const CPASAnimParm& parm8);

View File

@ -1,5 +1,5 @@
#include "CPASAnimState.hpp"
#include "CPASAnimParmData.hpp"
namespace urde
{
@ -51,12 +51,14 @@ CPASAnimState::CPASAnimState(CInputStream& in)
}
}
const CPASAnimParmData&CPASAnimState::GetAnimParmData(s32, u32) const
const CPASAnimParmData& CPASAnimState::GetAnimParmData(s32, u32) const
{
static const CPASAnimParmData badData;
return badData;
}
std::pair<float, s32> CPASAnimState::FindBestAnimation(const rstl::reserved_vector<CPASAnimParm, 8>&, CRandom16&, s32) const
{
return {};
}
}

View File

@ -74,14 +74,17 @@ void CParticleGenInfoGeneric::SetParticleEmission(bool, CStateManager& stateMgr)
bool CParticleGenInfoGeneric::IsSystemDeletable() const
{
return false;
}
zeus::CAABox CParticleGenInfoGeneric::GetBounds() const
{
return {};
}
bool CParticleGenInfoGeneric::HasActiveParticles() const
{
return false;
}
void CParticleGenInfoGeneric::DestroyParticles()
@ -90,10 +93,12 @@ void CParticleGenInfoGeneric::DestroyParticles()
bool CParticleGenInfoGeneric::HasLight() const
{
return false;
}
TUniqueId CParticleGenInfoGeneric::GetLightId() const
{
return 0;
}
void CParticleGenInfoGeneric::SetModulationColor(const zeus::CColor& color)

View File

@ -19,12 +19,13 @@ void CConstantAnimationTimeScale::VFindUpperLimit(const float&, const float&) co
std::shared_ptr<IVaryingAnimationTimeScale> CConstantAnimationTimeScale::VClone() const
{
return {};
}
std::shared_ptr<IVaryingAnimationTimeScale>
CConstantAnimationTimeScale::VGetFunctionMirrored(const float&) const
{
return {};
}
void CLinearAnimationTimeScale::VTimeScaleIntegral(const float&, const float&) const

View File

@ -10,7 +10,7 @@ std::shared_ptr<CAnimTreeNode>
IMetaAnim::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void IMetaAnim::AdvanceAnim(IAnimReader& anim, const CCharAnimTime& dt)

View File

@ -8,7 +8,7 @@
namespace urde
{
class CAnimTreeNode;
class CAnimSysContext;
struct CAnimSysContext;
class CMetaAnimTreeBuildOrders;
class CPrimitive;
class IAnimReader;

View File

@ -6,7 +6,7 @@
namespace urde
{
class CAnimTreeNode;
class CAnimSysContext;
struct CAnimSysContext;
enum class EMetaTransType
{

View File

@ -17,7 +17,7 @@ FourCC CCollidableOBBTree::GetPrimType() const
CRayCastResult CCollidableOBBTree::CastRayInternal(const CInternalRayCastStructure&) const
{
return {};
}
zeus::CAABox CCollidableOBBTree::CalculateAABox(const zeus::CTransform& xf) const

View File

@ -51,6 +51,7 @@ FourCC CCollidableOBBTreeGroup::GetPrimType() const
CRayCastResult CCollidableOBBTreeGroup::CastRayInternal(const CInternalRayCastStructure&) const
{
return {};
}
const CCollisionPrimitive::Type& CCollidableOBBTreeGroup::GetType()

View File

@ -22,7 +22,7 @@ private:
/*u32 x24_; */
CMaterialList x28_material;
public:
CRayCastResult();
CRayCastResult() = default;
CRayCastResult(const CRayCastResult& other, EInvalid invalid)
: x0_time(other.x0_time),
x4_point(other.x4_point),

View File

@ -9,18 +9,22 @@ CFrustumPlanes::CFrustumPlanes(const zeus::CTransform& cameraXf, float, float, f
bool CFrustumPlanes::PointInFrustumPlanes(const zeus::CVector3f& point) const
{
return false;
}
bool CFrustumPlanes::SphereInFrustumPlanes(const zeus::CSphere& sphere) const
{
return false;
}
bool CFrustumPlanes::BoxInFrustumPlanes(const zeus::CAABox& box) const
{
return false;
}
bool CFrustumPlanes::BoxInFrustumPlanes(const rstl::optional_object<zeus::CAABox>& box) const
{
return false;
}
}

View File

@ -2,12 +2,10 @@
#include "CActorParameters.hpp"
#include "CStateManager.hpp"
#include "Collision/CMaterialList.hpp"
#include "Graphics/CGraphics.hpp"
#include "Audio/CSfxManager.hpp"
namespace urde
{
static CMaterialList MakeActorMaterialList(const CMaterialList& materialList, const CActorParameters& params)
{
CMaterialList ret = materialList;

View File

@ -2,6 +2,7 @@
#define __URDE_CACTOR_HPP__
#include "CEntity.hpp"
#include "Graphics/CGraphics.hpp"
#include "Audio/CSfxHandle.hpp"
#include "zeus/zeus.hpp"
#include "Collision/CMaterialFilter.hpp"
@ -22,13 +23,6 @@ class CSimpleShadow;
class CActor : public CEntity
{
protected:
enum class Flags
{
Unknown5 = (1 << 5),
Unknown6 = (1 << 6),
Unknown7 = (1 << 7),
};
zeus::CTransform x34_transform;
std::unique_ptr<CModelData> x64_modelData;
CMaterialList x68_material;
@ -52,7 +46,7 @@ protected:
bool xe4_29_ : 1;
bool xe4_30_ : 1;
};
u8 dummy1 = 0;
u8 _dummy1 = 0;
};
union
@ -64,7 +58,7 @@ protected:
bool xe5_27_useInSortedLists : 1;
bool xe5_28_callTouch : 1;
};
u8 dummy2 = 0;
u8 _dummy2 = 0;
};
union
{
@ -73,7 +67,7 @@ protected:
bool xe6_26_inFluid : 1;
bool xe6_30_enablePitchBend : 1;
};
u8 dummy3 = 0;
u8 _dummy3 = 0;
};
union
{
@ -81,7 +75,7 @@ protected:
{
bool xe7_29_ : 1;
};
u8 dummy4 = 0;
u8 _dummy4 = 0;
};
public:
CActor(TUniqueId, bool, const std::string&, const CEntityInfo&,
@ -110,7 +104,7 @@ public:
void RemoveEmitter();
virtual std::experimental::optional<zeus::CAABox> GetTouchBounds() const { return {} ; }
virtual rstl::optional_object<zeus::CAABox> GetTouchBounds() const { return {} ; }
virtual EWeaponCollisionResponseTypes GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f&, CWeaponMode&, int);
void RemoveMaterial(EMaterialTypes, EMaterialTypes, EMaterialTypes, EMaterialTypes, CStateManager&);

View File

@ -3,12 +3,12 @@ set(WORLD_SOURCES
CWorldLight.hpp CWorldLight.cpp
IGameArea.hpp IGameArea.cpp
CGameArea.hpp CGameArea.cpp
CActor.hpp CActor.cpp
CAi.hpp CAi.cpp
CAiFuncMap.hpp CAiFuncMap.cpp
CPatterned.hpp CPatterned.cpp
CPathFindArea.hpp CPathFindArea.cpp
CAreaOctTree.hpp CAreaOctTree.cpp
CActor.hpp CActor.cpp
CPhysicsActor.hpp CPhysicsActor.cpp
CEntity.hpp CEntity.cpp
CPhysicsActor.hpp CPhysicsActor.cpp

View File

@ -13,7 +13,7 @@ CPhysicsActor::CPhysicsActor(TUniqueId uid, bool active, const std::string& name
zeus::CAABox CPhysicsActor::GetBoundingBox()
{
zeus::CAABox ret;
return {};
}
}

View File

@ -41,6 +41,7 @@ CLight CWorldLight::GetAsCGraphicsLight() const
if (f3 >= f0)
}
*/
return CLight::BuildPoint({}, {});
}
}

View File

@ -1050,6 +1050,7 @@ CEntity* ScriptLoader::LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream
CEntity* ScriptLoader::LoadCameraBlurKeyframe(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
u32 ClassifyVector(const zeus::CVector3f& dir)
@ -1118,16 +1119,19 @@ CEntity* ScriptLoader::LoadDamageableTrigger(CStateManager& mgr, CInputStream& i
CEntity* ScriptLoader::LoadDebris(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadCameraShaker(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadActorKeyframe(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in,
@ -1281,26 +1285,31 @@ CEntity* ScriptLoader::LoadWarWasp(CStateManager& mgr, CInputStream& in,
CEntity* ScriptLoader::LoadSpacePirate(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadFlyingPirate(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadElitePirate(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMetroidBeta(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadChozoGhost(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadCoverPoint(CStateManager& mgr, CInputStream& in,
@ -1323,21 +1332,25 @@ CEntity* ScriptLoader::LoadCoverPoint(CStateManager& mgr, CInputStream& in,
CEntity* ScriptLoader::LoadSpiderBallWaypoint(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadBloodFlower(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadFlickerBat(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPathCamera(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadGrapplePoint(CStateManager& mgr, CInputStream& in,
@ -1356,41 +1369,49 @@ CEntity* ScriptLoader::LoadGrapplePoint(CStateManager& mgr, CInputStream& in,
CEntity* ScriptLoader::LoadPuddleSpore(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadDebugCameraWaypoint(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadSpiderBallAttractionSurface(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPuddleToadGamma(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadDistanceFog(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadFireFlea(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMetareeAlpha(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadDockAreaChange(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadActorRotate(CStateManager& mgr, CInputStream& in,
@ -1441,91 +1462,109 @@ CEntity* ScriptLoader::LoadSpecialFunction(CStateManager& mgr, CInputStream& in,
CEntity* ScriptLoader::LoadSpankWeed(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadParasite(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPlayerHint(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadRipper(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPickupGenerator(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadAIKeyframe(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPointOfInterest(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadDrone(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMetroidAlpha(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadDebrisExtended(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadSteam(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadRipple(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadBallTrigger(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadTargetingPoint(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadEMPulse(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadIceSheegoth(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPlayerActor(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadFlaahgra(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadAreaAttributes(CStateManager& mgr, CInputStream& in,
@ -1554,286 +1593,343 @@ CEntity* ScriptLoader::LoadAreaAttributes(CStateManager& mgr, CInputStream& in,
CEntity* ScriptLoader::LoadFishCloud(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadFishCloudModifier(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadVisorFlare(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadWorldTeleporter(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadVisorGoo(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadJellyZap(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadControllerAction(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadSwitch(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPlayerStateChange(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadThardus(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadWallCrawlerSwarm(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadAIJumpPoint(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadFlaahgraTentacle(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadRoomAcoustics(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadColorModulate(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadThardusRockProjectile(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMidi(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadStreamedAudio(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadRepulsor(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadGunTurret(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadFogVolume(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadBabygoth(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadEyeball(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadRadialDamage(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadCameraPitchVolume(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadEnvFxDensityController(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMagdolite(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadTeamAIMgr(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadSnakeWeedSwarm(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::Load(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadActorContraption(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadOculus(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadGeemer(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadSpindleCamera(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadAtomicAlpha(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadCameraHintTrigger(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadRumbleEffect(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadAmbientAI(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadAtomicBeta(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadIceZoomer(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPuffer(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadTryclops(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadRidley(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadSeedling(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadThermalHeatFader(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadBurrower(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadScriptBeam(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadWorldLightFader(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMetroidPrimeStage2(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMetroidPrimeStage1(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadMazeNode(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadOmegaPirate(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPhazonPool(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadPhazonHealingNodule(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadNewCameraShaker(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadShadowProjector(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
return nullptr;
}
}

@ -1 +1 @@
Subproject commit feccc768424181f2c7287ed9e936f1ae3acdaca7
Subproject commit 4dff27e3c69b11d7fa8232c4b32d28089e524b57