AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 03:47:42 +00:00
Code Issues Projects Releases Wiki Activity

string_view refactor

Browse Source
This commit is contained in:
Jack Andersen
2017-11-12 20:19:18 -10:00
parent 742ab2514f
commit f7ec7bdc0c
345 changed files with 907 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CActor.cpp
View File

@@ -20,7 +20,7 @@ static CMaterialList MakeActorMaterialList(const CMaterialList& materialList, co
return ret;
}
CActor::CActor(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info, const zeus::CTransform&,
CActor::CActor(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CTransform&,
CModelData&& mData, const CMaterialList& list, const CActorParameters& params, TUniqueId otherUid)
: CEntity(uid, info, active, name)
, x68_material(MakeActorMaterialList(list, params))
@@ -139,12 +139,12 @@ void CActor::SetVolume(float vol)
CSfxManager::UpdateEmitter(x8c_loopingSfxHandle, GetTranslation(), zeus::CVector3f::skZero, vol);
}
const zeus::CTransform CActor::GetScaledLocatorTransform(const std::string& segName) const
const zeus::CTransform CActor::GetScaledLocatorTransform(std::string_view segName) const
{
return x64_modelData->GetScaledLocatorTransform(segName);
}
const zeus::CTransform CActor::GetLocatorTransform(const std::string& segName) const
const zeus::CTransform CActor::GetLocatorTransform(std::string_view segName) const
{
return x64_modelData->GetLocatorTransform(segName);
}

6
Runtime/World/CActor.hpp
View File

@@ -94,7 +94,7 @@ public:
Done,
};
CActor(TUniqueId, bool, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CActor(TUniqueId, bool, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CMaterialList&, const CActorParameters&, TUniqueId);
virtual void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
@@ -132,8 +132,8 @@ public:
void SetVolume(float vol);
const zeus::CTransform& GetTransform() const { return x34_transform; }
const zeus::CVector3f& GetTranslation() const { return x34_transform.origin; }
const zeus::CTransform GetScaledLocatorTransform(const std::string& segName) const;
const zeus::CTransform GetLocatorTransform(const std::string& segName) const;
const zeus::CTransform GetScaledLocatorTransform(std::string_view segName) const;
const zeus::CTransform GetLocatorTransform(std::string_view segName) const;
void RemoveMaterial(EMaterialTypes, EMaterialTypes, EMaterialTypes, EMaterialTypes, CStateManager&);
void RemoveMaterial(EMaterialTypes, EMaterialTypes, EMaterialTypes, CStateManager&);
void RemoveMaterial(EMaterialTypes, EMaterialTypes, CStateManager&);

2
Runtime/World/CAi.cpp
View File

@@ -14,7 +14,7 @@ static CMaterialList MakeAiMaterialList(const CMaterialList& in)
return ret;
}
CAi::CAi(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CAi::CAi(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const zeus::CAABox& box, float mass, const CHealthInfo& hInfo,
const CDamageVulnerability& dmgVuln, const CMaterialList& list, CAssetId fsm, const CActorParameters& actorParams,
float stepUp, float stepDown)

2
Runtime/World/CAi.hpp
View File

@@ -36,7 +36,7 @@ class CAi : public CPhysicsActor
TLockedToken<CStateMachine> x2c8_stateMachine;
public:
CAi(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CAi(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const zeus::CAABox& box, float mass, const CHealthInfo& hInfo, const CDamageVulnerability&,
const CMaterialList& list, CAssetId fsm, const CActorParameters&, float f1, float f2);

2
Runtime/World/CDestroyableRock.cpp
View File

@@ -3,7 +3,7 @@
namespace urde
{
CDestroyableRock::CDestroyableRock(TUniqueId id, bool active, const std::string& name, const CEntityInfo& info,
CDestroyableRock::CDestroyableRock(TUniqueId id, bool active, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& modelData, float mass, const CHealthInfo& health,
const CDamageVulnerability& vulnerability, const CMaterialList& matList, CAssetId fsm,
const CActorParameters& actParams, const CModelData& modelData2)

2
Runtime/World/CDestroyableRock.hpp
View File

@@ -9,7 +9,7 @@ namespace urde
class CDestroyableRock : public CAi
{
public:
CDestroyableRock(TUniqueId id, bool active, const std::string& name, const CEntityInfo& info,
CDestroyableRock(TUniqueId id, bool active, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& modelData, float mass, const CHealthInfo& health,
const CDamageVulnerability& vulnerability, const CMaterialList& matList, CAssetId fsm,
const CActorParameters& actParams, const CModelData& modelData2);

2
Runtime/World/CEffect.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CEffect::CEffect(TUniqueId uid, const CEntityInfo& info, bool active, const std::string& name, const zeus::CTransform& xf)
CEffect::CEffect(TUniqueId uid, const CEntityInfo& info, bool active, std::string_view name, const zeus::CTransform& xf)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::Unknown),
CActorParameters::None(), kInvalidUniqueId)
{

2
Runtime/World/CEffect.hpp
View File

@@ -9,7 +9,7 @@ namespace urde
class CEffect : public CActor
{
public:
CEffect(TUniqueId uid, const CEntityInfo& info, bool active, const std::string& name,
CEffect(TUniqueId uid, const CEntityInfo& info, bool active, std::string_view name,
const zeus::CTransform& xf);
virtual void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const {}

2
Runtime/World/CEntity.cpp
View File

@@ -5,7 +5,7 @@ namespace urde
{
const std::vector<SConnection> CEntity::NullConnectionList;
CEntity::CEntity(TUniqueId uniqueId, const CEntityInfo& info, bool active, const std::string& name)
CEntity::CEntity(TUniqueId uniqueId, const CEntityInfo& info, bool active, std::string_view name)
: x4_areaId(info.GetAreaId()), x8_uid(uniqueId), xc_editorId(info.GetEditorId()), x10_name(name),
x20_conns(info.GetConnectionList())
{

2
Runtime/World/CEntity.hpp
View File

@@ -36,7 +36,7 @@ protected:
public:
static const std::vector<SConnection> NullConnectionList;
virtual ~CEntity() = default;
CEntity(TUniqueId uid, const CEntityInfo& info, bool active, const std::string& name);
CEntity(TUniqueId uid, const CEntityInfo& info, bool active, std::string_view name);
virtual void Accept(IVisitor& visitor)=0;
virtual void PreThink(float, CStateManager&) {}
virtual void Think(float, CStateManager&) {}

2
Runtime/World/CExplosion.cpp
View File

@@ -5,7 +5,7 @@ namespace urde
{
CExplosion::CExplosion(const TLockedToken<CGenDescription>& particle, TUniqueId uid, bool active,
const CEntityInfo& info, const std::string& name, const zeus::CTransform& xf,
const CEntityInfo& info, std::string_view name, const zeus::CTransform& xf,
u32 flags, const zeus::CVector3f& scale, const zeus::CColor& color)
: CEffect(uid, info, active, name, xf)
{

2
Runtime/World/CExplosion.hpp
View File

@@ -20,7 +20,7 @@ class CExplosion : public CEffect
public:
CExplosion(const TLockedToken<CGenDescription>& particle, TUniqueId uid, bool active,
const CEntityInfo& info, const std::string& name, const zeus::CTransform& xf,
const CEntityInfo& info, std::string_view name, const zeus::CTransform& xf,
u32, const zeus::CVector3f& scale, const zeus::CColor& color);
void Accept(IVisitor&);

2
Runtime/World/CGameLight.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CGameLight::CGameLight(TUniqueId uid, TAreaId aid, bool active, const std::string& name, const zeus::CTransform& xf,
CGameLight::CGameLight(TUniqueId uid, TAreaId aid, bool active, std::string_view name, const zeus::CTransform& xf,
TUniqueId parentId, const CLight& light, u32 w1, u32 w2, float f1)
: CActor(uid, active, name, CEntityInfo(aid, CEntity::NullConnectionList), xf,
CModelData::CModelDataNull(), CMaterialList(), CActorParameters::None(), kInvalidUniqueId),

2
Runtime/World/CGameLight.hpp
View File

@@ -14,7 +14,7 @@ class CGameLight : public CActor
float x144_lifeTime;
public:
CGameLight(TUniqueId, TAreaId, bool, const std::string&, const zeus::CTransform&, TUniqueId, const CLight&, u32,
CGameLight(TUniqueId, TAreaId, bool, std::string_view, const zeus::CTransform&, TUniqueId, const CLight&, u32,
u32, float);
void Accept(IVisitor &visitor);

2
Runtime/World/CHUDBillboardEffect.cpp
View File

@@ -11,7 +11,7 @@ u32 CHUDBillboardEffect::g_BillboardCount = 0;
CHUDBillboardEffect::CHUDBillboardEffect(const std::experimental::optional<TToken<CGenDescription>>& particle,
const std::experimental::optional<TToken<CElectricDescription>>& electric,
TUniqueId uid, bool active, const std::string& name, float f,
TUniqueId uid, bool active, std::string_view name, float f,
const zeus::CVector3f& v0, const zeus::CColor& color,
const zeus::CVector3f& v1, const zeus::CVector3f& v2)
: CEffect(uid, CEntityInfo(kInvalidAreaId, CEntity::NullConnectionList), active, name, zeus::CTransform::Identity())

2
Runtime/World/CHUDBillboardEffect.hpp
View File

@@ -28,7 +28,7 @@ class CHUDBillboardEffect : public CEffect
public:
CHUDBillboardEffect(const std::experimental::optional<TToken<CGenDescription>>& particle,
const std::experimental::optional<TToken<CElectricDescription>>& electric,
TUniqueId uid, bool active, const std::string& name, float, const zeus::CVector3f& v0,
TUniqueId uid, bool active, std::string_view name, float, const zeus::CVector3f& v0,
const zeus::CColor& color, const zeus::CVector3f& v1, const zeus::CVector3f& v2);
~CHUDBillboardEffect();
void Accept(IVisitor& visitor);

4
Runtime/World/CMorphBall.cpp
View File

@@ -110,9 +110,9 @@ CMorphBall::CMorphBall(CPlayer& player, float radius)
InitializeWakeEffects();
}
void CMorphBall::LoadAnimationTokens(const std::string& ancsName)
void CMorphBall::LoadAnimationTokens(std::string_view ancsName)
{
TToken<CDependencyGroup> dgrp = g_SimplePool->GetObj((ancsName + "_DGRP").c_str());
TToken<CDependencyGroup> dgrp = g_SimplePool->GetObj((std::string(ancsName) + "_DGRP").c_str());
x1958_animationTokens.clear();
x1958_animationTokens.reserve(dgrp->GetObjectTagVector().size());
for (const SObjectTag& tag : dgrp->GetObjectTagVector())

2
Runtime/World/CMorphBall.hpp
View File

@@ -173,7 +173,7 @@ private:
float x1e48_damageEffectDecaySpeed = 0.f;
float x1e4c_damageTime = 0.f;
std::unique_ptr<CMorphBallShadow> x1e50_shadow;
void LoadAnimationTokens(const std::string& ancsName);
void LoadAnimationTokens(std::string_view ancsName);
void InitializeWakeEffects();
static std::unique_ptr<CModelData> GetMorphBallModel(const char* name, float radius);
void SelectMorphBallSounds(const CMaterialList& mat);

2
Runtime/World/CPatterned.cpp
View File

@@ -12,7 +12,7 @@ CMaterialList gkPatternedGroundMaterialList(EMaterialTypes::Character, EMaterial
CMaterialList gkPatternedFlyerMaterialList(EMaterialTypes::Character, EMaterialTypes::Solid,
EMaterialTypes::Orbit, EMaterialTypes::Target);
CPatterned::CPatterned(ECharacter character, TUniqueId uid, const std::string& name, CPatterned::EFlavorType flavor,
CPatterned::CPatterned(ECharacter character, TUniqueId uid, std::string_view name, CPatterned::EFlavorType flavor,
const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData,
const CPatternedInfo& pInfo, CPatterned::EMovementType moveType, CPatterned::EColliderType,
EBodyType, const CActorParameters& actorParms, int variant)

2
Runtime/World/CPatterned.hpp
View File

@@ -137,7 +137,7 @@ protected:
float x500_ = 0.f;
float x504_damageDur = 0.f;
public:
CPatterned(ECharacter character, TUniqueId uid, const std::string& name, EFlavorType flavor, const CEntityInfo& info,
CPatterned(ECharacter character, TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pinfo,
CPatterned::EMovementType movement, EColliderType collider, EBodyType body,
const CActorParameters& params, int variant);

2
Runtime/World/CPhysicsActor.cpp
View File

@@ -3,7 +3,7 @@
namespace urde
{
CPhysicsActor::CPhysicsActor(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info,
CPhysicsActor::CPhysicsActor(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CMaterialList& matList,
const zeus::CAABox& box, const SMoverData& moverData, const CActorParameters& actorParms,
float stepUp, float stepDown)

2
Runtime/World/CPhysicsActor.hpp
View File

@@ -119,7 +119,7 @@ protected:
u32 x250_numTicksPartialUpdate;
public:
CPhysicsActor(TUniqueId, bool, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CPhysicsActor(TUniqueId, bool, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CMaterialList&, const zeus::CAABox&, const SMoverData&, const CActorParameters&, float, float);
void Render(const CStateManager& mgr) const;

2
Runtime/World/CRepulsor.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CRepulsor::CRepulsor(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info,
CRepulsor::CRepulsor(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info,
const zeus::CVector3f& pos, float radius)
: CActor(uid, active, name, info, zeus::CTransform::Translate(pos), CModelData::CModelDataNull(), CMaterialList(),
CActorParameters::None(), kInvalidUniqueId)

2
Runtime/World/CRepulsor.hpp
View File

@@ -9,7 +9,7 @@ class CRepulsor : public CActor
float xe8_affectRadius;
public:
CRepulsor(TUniqueId, bool, const std::string&, const CEntityInfo&, const zeus::CVector3f&, float);
CRepulsor(TUniqueId, bool, std::string_view, const CEntityInfo&, const zeus::CVector3f&, float);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);

2
Runtime/World/CScriptActor.cpp
View File

@@ -11,7 +11,7 @@
namespace urde
{
CScriptActor::CScriptActor(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CScriptActor::CScriptActor(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const zeus::CAABox& aabb, float mass, float zMomentum,
const CMaterialList& matList, const CHealthInfo& hInfo, const CDamageVulnerability& dVuln,
const CActorParameters& actParms, bool looping, bool active, u32 w1, float f3, bool b2,

2
Runtime/World/CScriptActor.hpp
View File

@@ -30,7 +30,7 @@ protected:
bool x2e3_24_ : 1;
public:
CScriptActor(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CScriptActor(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const zeus::CAABox& aabb, float, float, const CMaterialList& matList, const CHealthInfo&,
const CDamageVulnerability&, const CActorParameters&, bool, bool, u32, float, bool, bool, bool, bool);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptActorKeyframe.cpp
View File

@@ -3,7 +3,7 @@
namespace urde
{
CScriptActorKeyframe::CScriptActorKeyframe(TUniqueId uid, const std::string& name, const CEntityInfo& info, s32 animId,
CScriptActorKeyframe::CScriptActorKeyframe(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 animId,
bool b1, float f1, bool b2, u32 w2, bool active, float totalPlayback)
: CEntity(uid, info, active, name)
, x34_animationId(animId)

2
Runtime/World/CScriptActorKeyframe.hpp
View File

@@ -26,7 +26,7 @@ private:
};
public:
CScriptActorKeyframe(TUniqueId uid, const std::string& name, const CEntityInfo& info, s32 w1, bool b1, float f1,
CScriptActorKeyframe(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 w1, bool b1, float f1,
bool b2, u32 w2, bool active, float f2);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptActorRotate.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptActorRotate::CScriptActorRotate(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptActorRotate::CScriptActorRotate(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CVector3f& rotation, float maxTime, bool updateActors,
bool updateOnCreation, bool active)
: CEntity(uid, info, active, name)

2
Runtime/World/CScriptActorRotate.hpp
View File

@@ -33,7 +33,7 @@ class CScriptActorRotate : public CEntity
void UpdatePlatformRiders(std::vector<SRiders>&, CScriptPlatform&,
const zeus::CTransform&, CStateManager&);
public:
CScriptActorRotate(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CVector3f&, float, bool, bool,
CScriptActorRotate(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CVector3f&, float, bool, bool,
bool);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptAiJumpPoint.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptAiJumpPoint::CScriptAiJumpPoint(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptAiJumpPoint::CScriptAiJumpPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
zeus::CTransform& xf, bool active, float f1)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::Unknown),
CActorParameters::None(), kInvalidUniqueId)

2
Runtime/World/CScriptAiJumpPoint.hpp
View File

@@ -23,7 +23,7 @@ private:
float x110_timeRemaining = 0.f;
public:
CScriptAiJumpPoint(TUniqueId, const std::string&, const CEntityInfo&, zeus::CTransform&, bool, float);
CScriptAiJumpPoint(TUniqueId, std::string_view, const CEntityInfo&, zeus::CTransform&, bool, float);
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);

2
Runtime/World/CScriptBeam.cpp
View File

@@ -8,7 +8,7 @@
namespace urde
{
CScriptBeam::CScriptBeam(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CScriptBeam::CScriptBeam(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
bool active, const TToken<CWeaponDescription>& weaponDesc, const CBeamInfo& bInfo,
const CDamageInfo& dInfo)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(), CActorParameters::None(),

2
Runtime/World/CScriptBeam.hpp
View File

@@ -15,7 +15,7 @@ class CScriptBeam : public CActor
CDamageInfo x138_damageInfo;
TUniqueId x154_projectileId;
public:
CScriptBeam(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, bool,
CScriptBeam(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, bool,
const TToken<CWeaponDescription>&, const CBeamInfo&, const CDamageInfo&);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptCameraBlurKeyframe.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CScriptCameraBlurKeyframe::CScriptCameraBlurKeyframe(TUniqueId uid, const std::string& name,
CScriptCameraBlurKeyframe::CScriptCameraBlurKeyframe(TUniqueId uid, std::string_view name,
const CEntityInfo& info, EBlurType type,
float amount, u32 unk, float timeIn,
float timeOut, bool active)

2
Runtime/World/CScriptCameraBlurKeyframe.hpp
View File

@@ -14,7 +14,7 @@ class CScriptCameraBlurKeyframe : public CEntity
float x40_timeIn;
float x44_timeOut;
public:
CScriptCameraBlurKeyframe(TUniqueId uid, const std::string& name,
CScriptCameraBlurKeyframe(TUniqueId uid, std::string_view name,
const CEntityInfo& info, EBlurType type,
float amount, u32 unk, float timeIn,
float timeOut, bool active);

2
Runtime/World/CScriptCameraFilterKeyframe.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CScriptCameraFilterKeyframe::CScriptCameraFilterKeyframe(TUniqueId uid, const std::string& name,
CScriptCameraFilterKeyframe::CScriptCameraFilterKeyframe(TUniqueId uid, std::string_view name,
const CEntityInfo& info, EFilterType type, EFilterShape shape,
u32 filterIdx, u32 unk, const zeus::CColor& color,
float timeIn, float timeOut, CAssetId txtr, bool active)

2
Runtime/World/CScriptCameraFilterKeyframe.hpp
View File

@@ -19,7 +19,7 @@ class CScriptCameraFilterKeyframe : public CEntity
CAssetId x50_txtr;
public:
CScriptCameraFilterKeyframe(TUniqueId uid, const std::string& name,
CScriptCameraFilterKeyframe(TUniqueId uid, std::string_view name,
const CEntityInfo& info, EFilterType type, EFilterShape shape,
u32 filterIdx, u32 unk, const zeus::CColor& color,
float timeIn, float timeOut, CAssetId txtr, bool active);

2
Runtime/World/CScriptCameraHint.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptCameraHint::CScriptCameraHint(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptCameraHint::CScriptCameraHint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, s32 priority,
CBallCamera::EBallCameraBehaviour behaviour, u32 overrideFlags, float minDist,
float maxDist, float backwardsDist, const zeus::CVector3f& lookAtOffset,

2
Runtime/World/CScriptCameraHint.hpp
View File

@@ -72,7 +72,7 @@ class CScriptCameraHint : public CActor
void AddHelper(TUniqueId id);
void RemoveHelper(TUniqueId id);
public:
CScriptCameraHint(TUniqueId, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CScriptCameraHint(TUniqueId, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
bool active, s32 priority, CBallCamera::EBallCameraBehaviour behaviour, u32 overrideFlags,
float minDist, float maxDist, float backwardsDist, const zeus::CVector3f& lookAtOffset,
const zeus::CVector3f& chaseLookAtOffset, const zeus::CVector3f& ballToCam, float fov,

2
Runtime/World/CScriptCameraHintTrigger.cpp
View File

@@ -5,7 +5,7 @@
namespace urde
{
CScriptCameraHintTrigger::CScriptCameraHintTrigger(TUniqueId uid, bool active, const std::string& name,
CScriptCameraHintTrigger::CScriptCameraHintTrigger(TUniqueId uid, bool active, std::string_view name,
const CEntityInfo& info, const zeus::CVector3f& scale,
const zeus::CTransform& xf, bool b2, bool b3)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::Trigger),

2
Runtime/World/CScriptCameraHintTrigger.hpp
View File

@@ -22,7 +22,7 @@ class CScriptCameraHintTrigger : public CActor
};
public:
CScriptCameraHintTrigger(TUniqueId, bool, const std::string& name, const CEntityInfo&, const zeus::CVector3f&,
CScriptCameraHintTrigger(TUniqueId, bool, std::string_view name, const CEntityInfo&, const zeus::CVector3f&,
const zeus::CTransform&, bool, bool);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptCameraPitchVolume.cpp
View File

@@ -11,7 +11,7 @@ namespace urde
{
const zeus::CVector3f CScriptCameraPitchVolume::skScaleFactor = {0.5f};
CScriptCameraPitchVolume::CScriptCameraPitchVolume(TUniqueId uid, bool active, const std::string& name,
CScriptCameraPitchVolume::CScriptCameraPitchVolume(TUniqueId uid, bool active, std::string_view name,
const CEntityInfo& info, const zeus::CVector3f& scale,
const zeus::CTransform& xf, const zeus::CRelAngle& r1,
const zeus::CRelAngle& r2, float maxInterpDistance)

2
Runtime/World/CScriptCameraPitchVolume.hpp
View File

@@ -26,7 +26,7 @@ class CScriptCameraPitchVolume : public CActor
};
public:
CScriptCameraPitchVolume(TUniqueId, bool, const std::string&, const CEntityInfo&, const zeus::CVector3f&,
CScriptCameraPitchVolume(TUniqueId, bool, std::string_view, const CEntityInfo&, const zeus::CVector3f&,
const zeus::CTransform&, const zeus::CRelAngle&, const zeus::CRelAngle&, float);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptCameraShaker.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptCameraShaker::CScriptCameraShaker(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptCameraShaker::CScriptCameraShaker(TUniqueId uid, std::string_view name, const CEntityInfo& info,
bool active, const CCameraShakeData& shakeData)
: CEntity(uid, info, active, name), x34_shakeData(shakeData)
{}

2
Runtime/World/CScriptCameraShaker.hpp
View File

@@ -11,7 +11,7 @@ class CScriptCameraShaker : public CEntity
{
CCameraShakeData x34_shakeData;
public:
CScriptCameraShaker(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptCameraShaker(TUniqueId uid, std::string_view name, const CEntityInfo& info,
bool active, const CCameraShakeData& shakeData);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);

2
Runtime/World/CScriptCameraWaypoint.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptCameraWaypoint::CScriptCameraWaypoint(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptCameraWaypoint::CScriptCameraWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, float f1, u32 w1)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::Unknown),
CActorParameters::None(), kInvalidUniqueId)

2
Runtime/World/CScriptCameraWaypoint.hpp
View File

@@ -11,7 +11,7 @@ class CScriptCameraWaypoint : public CActor
float xe8_;
u32 xec_;
public:
CScriptCameraWaypoint(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptCameraWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, float, u32);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptColorModulate.cpp
View File

@@ -5,7 +5,7 @@
namespace urde
{
CScriptColorModulate::CScriptColorModulate(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptColorModulate::CScriptColorModulate(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CColor& c1, const zeus::CColor& c2,
EBlendMode bm, float f1, float f2,
bool b1, bool b2, bool b3, bool b4, bool b5, bool active)

2
Runtime/World/CScriptColorModulate.hpp
View File

@@ -41,7 +41,7 @@ private:
};
public:
CScriptColorModulate(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CColor&, const zeus::CColor&,
CScriptColorModulate(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CColor&, const zeus::CColor&,
EBlendMode, float, float, bool, bool, bool, bool, bool, bool);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptControllerAction.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptControllerAction::CScriptControllerAction(TUniqueId uid, const std::string& name,
CScriptControllerAction::CScriptControllerAction(TUniqueId uid, std::string_view name,
const CEntityInfo& info, bool active,
ControlMapper::ECommands command, bool mapScreenResponse, u32 w1, bool deactivateOnClose)
: CEntity(uid, info, active, name), x34_command(command), x38_mapScreenSubaction(w1)

2
Runtime/World/CScriptControllerAction.hpp
View File

@@ -22,7 +22,7 @@ class CScriptControllerAction : public CEntity
u8 _dummy = 0;
};
public:
CScriptControllerAction(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptControllerAction(TUniqueId uid, std::string_view name, const CEntityInfo& info,
bool active, ControlMapper::ECommands command, bool b1, u32 w1, bool b2);
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);

2
Runtime/World/CScriptCounter.cpp
View File

@@ -5,7 +5,7 @@
namespace urde
{
CScriptCounter::CScriptCounter(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptCounter::CScriptCounter(TUniqueId uid, std::string_view name, const CEntityInfo& info,
s32 initial, s32 max, bool autoReset, bool active)
: CEntity(uid, info, active, name)
, x34_initial(initial)

2
Runtime/World/CScriptCounter.hpp
View File

@@ -13,7 +13,7 @@ class CScriptCounter : public CEntity
s32 x3c_max;
bool x40_autoReset;
public:
CScriptCounter(TUniqueId, const std::string& name, const CEntityInfo& info,
CScriptCounter(TUniqueId, std::string_view name, const CEntityInfo& info,
s32, s32, bool, bool);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptCoverPoint.cpp
View File

@@ -5,7 +5,7 @@
namespace urde
{
CScriptCoverPoint::CScriptCoverPoint(TUniqueId uid, const std::string &name, const CEntityInfo &info,
CScriptCoverPoint::CScriptCoverPoint(TUniqueId uid, std::string_view name, const CEntityInfo &info,
zeus::CTransform xf, bool active, u32 flags, bool crouch, float horizontalAngle, float verticalAngle, float coverTime)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(),
CMaterialList(EMaterialTypes::Unknown), CActorParameters::None(), kInvalidUniqueId),

2
Runtime/World/CScriptCoverPoint.hpp
View File

@@ -35,7 +35,7 @@ class CScriptCoverPoint : public CActor
std::experimental::optional<zeus::CAABox> x100_touchBounds;
float x11c_timeLeft = 0.f;
public:
CScriptCoverPoint(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptCoverPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
zeus::CTransform xf, bool active, u32 flags, bool crouch, float horizontalAngle, float verticalAngle, float coverTime);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptDamageableTrigger.cpp
View File

@@ -24,7 +24,7 @@ CMaterialList MakeDamageableTriggerMaterial(CScriptDamageableTrigger::ECanOrbit
}
CScriptDamageableTrigger::CScriptDamageableTrigger(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptDamageableTrigger::CScriptDamageableTrigger(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CVector3f& position, const zeus::CVector3f& extent,
const CHealthInfo& hInfo, const CDamageVulnerability& dVuln,
u32 faceFlag, CAssetId patternTex1, CAssetId patternTex2,

2
Runtime/World/CScriptDamageableTrigger.hpp
View File

@@ -45,7 +45,7 @@ public:
void SetLinkedObjectAlpha(float a, CStateManager& mgr);
float GetPuddleAlphaScale() const;
public:
CScriptDamageableTrigger(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptDamageableTrigger(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CVector3f& position, const zeus::CVector3f& extent,
const CHealthInfo& hInfo, const CDamageVulnerability& dVuln,
u32 faceFlag, CAssetId patternTex1, CAssetId patternTex2,

4
Runtime/World/CScriptDebris.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CScriptDebris::CScriptDebris(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CScriptDebris::CScriptDebris(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CActorParameters& aParams, CAssetId, const zeus::CVector3f&, float,
const zeus::CVector3f&, const zeus::CColor&, float f1, float f2, float f3,
CScriptDebris::EScaleType, bool, bool, bool active)
@@ -15,7 +15,7 @@ CScriptDebris::CScriptDebris(TUniqueId uid, const std::string& name, const CEnti
}
CScriptDebris::CScriptDebris(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CScriptDebris::CScriptDebris(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CActorParameters& aParams, float, float, float, float, float,
float, float, float, float, const zeus::CColor&, const zeus::CColor&, float,
const zeus::CVector3f&, const zeus::CVector3f&, float, float,

4
Runtime/World/CScriptDebris.hpp
View File

@@ -19,11 +19,11 @@ public:
private:
TReservedAverage<float, 8> x2e0_;
public:
CScriptDebris(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CScriptDebris(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CActorParameters&, CAssetId, const zeus::CVector3f&, float, const zeus::CVector3f&,
const zeus::CColor&, float, float, float, EScaleType, bool, bool, bool);
CScriptDebris(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CScriptDebris(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CActorParameters&, float, float, float, float, float, float, float, float, float,
const zeus::CColor&, const zeus::CColor&, float, const zeus::CVector3f&, const zeus::CVector3f&,
float, float, const zeus::CVector3f&, CAssetId, const zeus::CVector3f&, bool, bool, EOrientationType, CAssetId,

2
Runtime/World/CScriptDistanceFog.cpp
View File

@@ -5,7 +5,7 @@
namespace urde
{
CScriptDistanceFog::CScriptDistanceFog(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptDistanceFog::CScriptDistanceFog(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const ERglFogMode& mode, const zeus::CColor& color,
const zeus::CVector2f& range, float colorDelta,
const zeus::CVector2f& rangeDelta, bool expl, bool active,

2
Runtime/World/CScriptDistanceFog.hpp
View File

@@ -20,7 +20,7 @@ class CScriptDistanceFog : public CEntity
bool x60_explicit;
bool x61_nonZero;
public:
CScriptDistanceFog(TUniqueId, const std::string&, const CEntityInfo&, const ERglFogMode&,
CScriptDistanceFog(TUniqueId, std::string_view, const CEntityInfo&, const ERglFogMode&,
const zeus::CColor&, const zeus::CVector2f&, float, const zeus::CVector2f&,
bool, bool, float, float, float, float);

2
Runtime/World/CScriptDock.cpp
View File

@@ -20,7 +20,7 @@ CMaterialList MakeDockMaterialList()
return list;
}
CScriptDock::CScriptDock(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptDock::CScriptDock(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CVector3f position, const zeus::CVector3f& extents, s32 dock, TAreaId area,
bool active, s32 dockReferenceCount, bool loadConnected)
: CPhysicsActor(uid, active, name, info, zeus::CTransform(zeus::CMatrix3f::skIdentityMatrix3f, position),

2
Runtime/World/CScriptDock.hpp
View File

@@ -32,7 +32,7 @@ class CScriptDock : public CPhysicsActor
};
public:
CScriptDock(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CVector3f position,
CScriptDock(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f position,
const zeus::CVector3f& extent, s32 dock, TAreaId area, bool active,
s32 dockReferenceCount, bool loadConnected);

2
Runtime/World/CScriptDockAreaChange.cpp
View File

@@ -5,7 +5,7 @@
namespace urde
{
CScriptDockAreaChange::CScriptDockAreaChange(TUniqueId uid, const std::string& name, const CEntityInfo& info, s32 w1,
CScriptDockAreaChange::CScriptDockAreaChange(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 w1,
bool active)
: CEntity(uid, info, active, name), x34_dockReference(w1)
{

2
Runtime/World/CScriptDockAreaChange.hpp
View File

@@ -9,7 +9,7 @@ class CScriptDockAreaChange : public CEntity
{
s32 x34_dockReference;
public:
CScriptDockAreaChange(TUniqueId, const std::string&, const CEntityInfo&, s32, bool);
CScriptDockAreaChange(TUniqueId, std::string_view, const CEntityInfo&, s32, bool);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager &stateMgr);

2
Runtime/World/CScriptDoor.cpp
View File

@@ -25,7 +25,7 @@ static CMaterialList MakeDoorMaterialList(bool open)
return ret;
}
CScriptDoor::CScriptDoor(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptDoor::CScriptDoor(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& actParms,
const zeus::CVector3f&, const zeus::CAABox& aabb, bool active,
bool open, bool b2, float, bool ballDoor)

2
Runtime/World/CScriptDoor.hpp
View File

@@ -51,7 +51,7 @@ public:
u32 dummy2 = 0;
};
public:
CScriptDoor(TUniqueId, const std::string& name, const CEntityInfo& info,
CScriptDoor(TUniqueId, std::string_view name, const CEntityInfo& info,
const zeus::CTransform&, CModelData&&, const CActorParameters&,
const zeus::CVector3f&, const zeus::CAABox&,
bool active, bool open, bool, float, bool ballDoor);

2
Runtime/World/CScriptEffect.cpp
View File

@@ -10,7 +10,7 @@ namespace urde
u32 CScriptEffect::g_NumParticlesUpdating = 0;
u32 CScriptEffect::g_NumParticlesRendered = 0;
CScriptEffect::CScriptEffect(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptEffect::CScriptEffect(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, const zeus::CVector3f& scale,
CAssetId partId, CAssetId elscId, bool, bool, bool, bool active,
bool, float, float, float, float, bool, float, float, float,

2
Runtime/World/CScriptEffect.hpp
View File

@@ -11,7 +11,7 @@ class CScriptEffect : public CActor
static u32 g_NumParticlesUpdating;
static u32 g_NumParticlesRendered;
public:
CScriptEffect(TUniqueId, const std::string& name, const CEntityInfo& info,
CScriptEffect(TUniqueId, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, const zeus::CVector3f& scale,
CAssetId partId, CAssetId elscId, bool, bool, bool, bool active,
bool, float, float, float, float, bool, float, float, float,

2
Runtime/World/CScriptGenerator.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptGenerator::CScriptGenerator(TUniqueId uid, const std::string& name, const CEntityInfo& info, u32 spawnCount,
CScriptGenerator::CScriptGenerator(TUniqueId uid, std::string_view name, const CEntityInfo& info, u32 spawnCount,
bool reuseFollowers, const zeus::CVector3f& vec1, bool inheritXf, bool active,
float minScale, float maxScale)
: CEntity(uid, info, active, name)

2
Runtime/World/CScriptGenerator.hpp
View File

@@ -23,7 +23,7 @@ class CScriptGenerator : public CEntity
float x4c_maxScale;
public:
CScriptGenerator(TUniqueId uid, const std::string& name, const CEntityInfo& info, u32, bool, const zeus::CVector3f&,
CScriptGenerator(TUniqueId uid, std::string_view name, const CEntityInfo& info, u32, bool, const zeus::CVector3f&,
bool, bool, float, float);
void Accept(IVisitor& visitor);

5
Runtime/World/CScriptGrapplePoint.cpp
View File

@@ -6,8 +6,9 @@
namespace urde
{
CScriptGrapplePoint::CScriptGrapplePoint(TUniqueId uid, const std::string &name, const CEntityInfo& info,
const zeus::CTransform &transform, bool active, const CGrappleParameters &params)
CScriptGrapplePoint::CScriptGrapplePoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform &transform, bool active,
const CGrappleParameters &params)
: CActor(uid, active, name, info, transform, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::Orbit),
CActorParameters::None(),
kInvalidUniqueId),

4
Runtime/World/CScriptGrapplePoint.hpp
View File

@@ -11,8 +11,8 @@ class CScriptGrapplePoint : public CActor
zeus::CAABox xe8_;
CGrappleParameters x100_parameters;
public:
CScriptGrapplePoint(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& transform,
bool active, const CGrappleParameters& params);
CScriptGrapplePoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& transform, bool active, const CGrappleParameters& params);
void Accept(IVisitor& visitor);
const CGrappleParameters& GetGrappleParameters() const { return x100_parameters; }

2
Runtime/World/CScriptHUDMemo.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, const std::string& name, const CEntityInfo& info, const CHUDMemoParms&,
CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, std::string_view name, const CEntityInfo& info, const CHUDMemoParms&,
CScriptHUDMemo::EDisplayType, CAssetId, bool active)
: CEntity(uid, info, active, name)
{

2
Runtime/World/CScriptHUDMemo.hpp
View File

@@ -17,7 +17,7 @@ public:
private:
public:
CScriptHUDMemo(TUniqueId, const std::string&, const CEntityInfo&, const CHUDMemoParms&,
CScriptHUDMemo(TUniqueId, std::string_view, const CEntityInfo&, const CHUDMemoParms&,
CScriptHUDMemo::EDisplayType, CAssetId, bool);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptMazeNode.cpp
View File

@@ -9,7 +9,7 @@ namespace urde
atUint32 CScriptMazeNode::sMazeSeeds[300] = {0};
CScriptMazeNode::CScriptMazeNode(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptMazeNode::CScriptMazeNode(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, s32 w1, s32 w2, s32 w3,
const zeus::CVector3f& vec1, const zeus::CVector3f& vec2, const zeus::CVector3f& vec3)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(), CActorParameters::None(),

2
Runtime/World/CScriptMazeNode.hpp
View File

@@ -33,7 +33,7 @@ class CScriptMazeNode : public CActor
u8 dummy = 0;
};
public:
CScriptMazeNode(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, bool, s32, s32, s32,
CScriptMazeNode(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, bool, s32, s32, s32,
const zeus::CVector3f&, const zeus::CVector3f&, const zeus::CVector3f&);
void Accept(IVisitor &visitor);

2
Runtime/World/CScriptMemoryRelay.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptMemoryRelay::CScriptMemoryRelay(TUniqueId uid, const std::string& name, const CEntityInfo& info, bool b1,
CScriptMemoryRelay::CScriptMemoryRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool b1,
bool skipSendActive, bool ignoreMessages)
: CEntity(uid, info, true, name),
x34_24_(b1),

2
Runtime/World/CScriptMemoryRelay.hpp
View File

@@ -18,7 +18,7 @@ class CScriptMemoryRelay : public CEntity
u8 dummy = 0;
};
public:
CScriptMemoryRelay(TUniqueId, const std::string& name, const CEntityInfo&, bool, bool, bool);
CScriptMemoryRelay(TUniqueId, std::string_view name, const CEntityInfo&, bool, bool, bool);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager &stateMgr);
};

2
Runtime/World/CScriptMidi.cpp
View File

@@ -9,7 +9,7 @@
namespace urde
{
CScriptMidi::CScriptMidi(TUniqueId id, const CEntityInfo& info, const std::string& name,
CScriptMidi::CScriptMidi(TUniqueId id, const CEntityInfo& info, std::string_view name,
bool active, CAssetId csng, float fadeIn, float fadeOut, s32 volume)
: CEntity(id, info, active, name), x40_fadeInTime(fadeIn), x44_fadeOutTime(fadeOut),
x48_volume(volume)

2
Runtime/World/CScriptMidi.hpp
View File

@@ -19,7 +19,7 @@ class CScriptMidi : public CEntity
void StopInternal(float fadeTime);
public:
CScriptMidi(TUniqueId id, const CEntityInfo& info, const std::string& name,
CScriptMidi(TUniqueId id, const CEntityInfo& info, std::string_view name,
bool active, CAssetId csng, float, float, s32);
void Stop(CStateManager& mgr, float fadeTime);

2
Runtime/World/CScriptPickup.cpp
View File

@@ -14,7 +14,7 @@
namespace urde
{
CScriptPickup::CScriptPickup(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptPickup::CScriptPickup(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& aParams,
const zeus::CAABox& aabb, CPlayerState::EItemType itemType, s32 amount, s32 capacity,
CAssetId explosionEffect, float possibility, float f2, float f3, float f4, bool active)

2
Runtime/World/CScriptPickup.hpp
View File

@@ -24,7 +24,7 @@ class CScriptPickup : public CPhysicsActor
u8 x28c_26_ : 1;
public:
CScriptPickup(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
CScriptPickup(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CActorParameters&, const zeus::CAABox&, CPlayerState::EItemType, s32, s32, CAssetId, float,
float, float, float, bool);

2
Runtime/World/CScriptPickupGenerator.cpp
View File

@@ -3,7 +3,7 @@
namespace urde
{
CScriptPickupGenerator::CScriptPickupGenerator(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptPickupGenerator::CScriptPickupGenerator(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CVector3f& pos, float frequency, bool active)
: CEntity(uid, info, active, name), x34_position(pos), x40_frequency(frequency)
{

2
Runtime/World/CScriptPickupGenerator.hpp
View File

@@ -13,7 +13,7 @@ class CScriptPickupGenerator : public CEntity
float x44_ = 0.f;
void sub8015E220();
public:
CScriptPickupGenerator(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CVector3f&, float, bool);
CScriptPickupGenerator(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CVector3f&, float, bool);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager &stateMgr);

2
Runtime/World/CScriptPlatform.cpp
View File

@@ -16,7 +16,7 @@ static CMaterialList MakePlatformMaterialList()
return ret;
}
CScriptPlatform::CScriptPlatform(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptPlatform::CScriptPlatform(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& actParms,
const zeus::CAABox& aabb, float f1, bool, float f2, bool active,
const CHealthInfo& hInfo, const CDamageVulnerability& dVuln,

2
Runtime/World/CScriptPlatform.hpp
View File

@@ -60,7 +60,7 @@ class CScriptPlatform : public CPhysicsActor
};
public:
CScriptPlatform(TUniqueId, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CScriptPlatform(TUniqueId, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CActorParameters& actParms, const zeus::CAABox& aabb, float, bool, float,
bool, const CHealthInfo& hInfo, const CDamageVulnerability& dInfo,
const rstl::optional_object<TLockedToken<CCollidableOBBTreeGroupContainer>>& dcln, bool, u32, u32);

2
Runtime/World/CScriptPlayerActor.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CScriptPlayerActor::CScriptPlayerActor(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptPlayerActor::CScriptPlayerActor(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, const CAnimRes& animRes, CModelData&& mData,
const zeus::CAABox& aabox, bool b1, const CMaterialList& list, float mass,
float zMomentum, const CHealthInfo& hInfo, const CDamageVulnerability& dVuln,

2
Runtime/World/CScriptPlayerActor.hpp
View File

@@ -40,7 +40,7 @@ class CScriptPlayerActor : public CScriptActor
};
public:
CScriptPlayerActor(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, const CAnimRes&,
CScriptPlayerActor(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, const CAnimRes&,
CModelData&&, const zeus::CAABox&, bool, const CMaterialList&, float, float,
const CHealthInfo&, const CDamageVulnerability&, const CActorParameters&, bool, bool, u32, u32);

2
Runtime/World/CScriptPlayerHint.cpp
View File

@@ -8,7 +8,7 @@
namespace urde
{
CScriptPlayerHint::CScriptPlayerHint(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptPlayerHint::CScriptPlayerHint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, u32 priority, u32 overrideFlags)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), {EMaterialTypes::Unknown},
CActorParameters::None(), kInvalidUniqueId), x100_priority(priority), x104_overrideFlags(overrideFlags)

2
Runtime/World/CScriptPlayerHint.hpp
View File

@@ -16,7 +16,7 @@ class CScriptPlayerHint : public CActor
void AddToObjectList(TUniqueId uid);
void RemoveFromObjectList(TUniqueId uid);
public:
CScriptPlayerHint(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptPlayerHint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, u32 priority, u32 overrideFlags);
void Accept(IVisitor& visit);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);

2
Runtime/World/CScriptPlayerStateChange.cpp
View File

@@ -6,7 +6,7 @@
namespace urde
{
CScriptPlayerStateChange::CScriptPlayerStateChange(TUniqueId uid, const std::string& name, const CEntityInfo& info,
CScriptPlayerStateChange::CScriptPlayerStateChange(TUniqueId uid, std::string_view name, const CEntityInfo& info,
bool active, u32 itemType, u32 itemCount, u32 itemCapacity,
EControl control, EControlCommandOption controlCmdOpt)
: CEntity(uid, info, active, name)

2
Runtime/World/CScriptPlayerStateChange.hpp
View File

@@ -25,7 +25,7 @@ private:
EControl x40_ctrl;
EControlCommandOption x44_ctrlCmdOpt;
public:
CScriptPlayerStateChange(TUniqueId, const std::string&, const CEntityInfo&, bool, u32, u32, u32, EControl,
CScriptPlayerStateChange(TUniqueId, std::string_view, const CEntityInfo&, bool, u32, u32, u32, EControl,
EControlCommandOption);
void Accept(IVisitor& visit);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);

2
Runtime/World/CScriptPointOfInterest.cpp
View File

@@ -7,7 +7,7 @@
namespace urde
{
CScriptPointOfInterest::CScriptPointOfInterest(TUniqueId uid, const std::string& name, const CEntityInfo info,
CScriptPointOfInterest::CScriptPointOfInterest(TUniqueId uid, std::string_view name, const CEntityInfo info,
const zeus::CTransform& xf, bool active,
const CScannableParameters& parms, float f1)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(u64(EMaterialTypes::Orbit)),

2
Runtime/World/CScriptPointOfInterest.hpp
View File

@@ -11,7 +11,7 @@ class CScriptPointOfInterest : public CActor
private:
float xe8_pointSize;
public:
CScriptPointOfInterest(TUniqueId, const std::string&, const CEntityInfo, const zeus::CTransform&, bool,
CScriptPointOfInterest(TUniqueId, std::string_view, const CEntityInfo, const zeus::CTransform&, bool,
const CScannableParameters&, float);
void Accept(IVisitor& visitor);

2
Runtime/World/CScriptRandomRelay.cpp
View File

@@ -4,7 +4,7 @@
namespace urde
{
CScriptRandomRelay::CScriptRandomRelay(TUniqueId uid, const std::string& name, const CEntityInfo& info, s32 connCount, s32 variance,
CScriptRandomRelay::CScriptRandomRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 connCount, s32 variance,
bool clamp, bool active)
: CEntity(uid, info, active, name),
x34_connectionCount((clamp && connCount > 100) ? 100 : connCount),

2
Runtime/World/CScriptRandomRelay.hpp
View File

@@ -11,7 +11,7 @@ class CScriptRandomRelay : public CEntity
u32 x38_variance;
bool x3c_clamp;
public:
CScriptRandomRelay(TUniqueId, const std::string&, const CEntityInfo&, s32, s32, bool, bool);
CScriptRandomRelay(TUniqueId, std::string_view, const CEntityInfo&, s32, s32, bool, bool);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager &stateMgr);

2
Runtime/World/CScriptRelay.cpp
View File

@@ -5,7 +5,7 @@
namespace urde
{
CScriptRelay::CScriptRelay(TUniqueId uid, const std::string& name, const CEntityInfo& info, bool active)
CScriptRelay::CScriptRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active)
: CEntity(uid, info, active, name)
{
}

2
Runtime/World/CScriptRelay.hpp
View File

@@ -10,7 +10,7 @@ class CScriptRelay : public CEntity
TUniqueId x34_nextRelay = kInvalidUniqueId;
u32 x38_refCount = 0;
public:
CScriptRelay(TUniqueId, const std::string&, const CEntityInfo&, bool);
CScriptRelay(TUniqueId, std::string_view, const CEntityInfo&, bool);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager &stateMgr);

Some files were not shown because too many files have changed in this diff Show More