mirror of
https://github.com/PrimeDecomp/prime.git
synced 2025-09-19 20:29:35 +00:00
parent
3ad420bf9d
commit
b3772f6db5
@ -53,7 +53,7 @@ public:
|
||||
kSS_Done,
|
||||
};
|
||||
|
||||
CActor(TUniqueId uid, bool active, const rstl::string& name, const CEntityInfo& info,
|
||||
CActor(const TUniqueId uid, const bool active, const rstl::string& name, const CEntityInfo& info,
|
||||
const CTransform4f& xf, const CModelData& mData, const CMaterialList& list,
|
||||
const CActorParameters& params, TUniqueId nextDrawNode);
|
||||
~CActor() override;
|
||||
|
@ -5,11 +5,17 @@
|
||||
|
||||
class CScriptSpiderBallWaypoint : public CActor {
|
||||
public:
|
||||
CScriptSpiderBallWaypoint(TUniqueId, const rstl::string&, const CEntityInfo&,
|
||||
const CTransform4f& xf, const bool active, uint w1);
|
||||
|
||||
void ClearWaypoints();
|
||||
void BuildWaypointListAndBounds(CStateManager& mgr);
|
||||
|
||||
private:
|
||||
enum ECheckActiveWaypoint { kCAW_Check, kCAW_SkipCheck };
|
||||
enum ECheckActiveWaypoint {
|
||||
kCAW_Check,
|
||||
kCAW_SkipCheck,
|
||||
};
|
||||
|
||||
uint xe8_;
|
||||
rstl::vector< TUniqueId > xec_waypoints;
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
#include "MetroidPrime/CActorParameters.hpp"
|
||||
|
||||
CEffect::CEffect(TUniqueId uid, const CEntityInfo& info, bool active, const rstl::string& name,
|
||||
const CTransform4f& xf)
|
||||
CEffect::CEffect(TUniqueId uid, const CEntityInfo& info, const bool active,
|
||||
const rstl::string& name, const CTransform4f& xf)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId) {}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
#include "MetroidPrime/CActorParameters.hpp"
|
||||
|
||||
CGameLight::CGameLight(TUniqueId uid, TAreaId aid, bool active, const rstl::string& name,
|
||||
CGameLight::CGameLight(TUniqueId uid, TAreaId aid, const bool active, const rstl::string& name,
|
||||
const CTransform4f& xf, TUniqueId parentId, const CLight& light,
|
||||
uint sourceId, uint priority, float lifeTime)
|
||||
: CActor(uid, active, name, CEntityInfo(aid, CEntity::NullConnectionList), xf,
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
const float CPhysicsActor::kGravityAccel = 9.81f * 2.5f;
|
||||
|
||||
CPhysicsActor::CPhysicsActor(TUniqueId uid, bool active, const rstl::string& name,
|
||||
CPhysicsActor::CPhysicsActor(TUniqueId uid, const bool active, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
const CModelData& mData, const CMaterialList& matList,
|
||||
const CAABox& aabb, const SMoverData& moverData,
|
||||
|
@ -16,10 +16,10 @@
|
||||
#include "rstl/optional_object.hpp"
|
||||
#include <rstl/math.hpp>
|
||||
|
||||
CFire::CFire(const TToken< CGenDescription >& effect, TUniqueId uid, TAreaId area, bool active,
|
||||
TUniqueId owner, const CTransform4f& xf, const CDamageInfo& dInfo, const CAABox& aabox,
|
||||
const CVector3f& vec, bool b1, CAssetId visorEffect, bool b2, bool b3, bool b4,
|
||||
float f1, float f2, float f3, float f4)
|
||||
CFire::CFire(const TToken< CGenDescription >& effect, TUniqueId uid, TAreaId area,
|
||||
const bool active, TUniqueId owner, const CTransform4f& xf, const CDamageInfo& dInfo,
|
||||
const CAABox& aabox, const CVector3f& vec, bool b1, CAssetId visorEffect, bool b2,
|
||||
bool b3, bool b4, float f1, float f2, float f3, float f4)
|
||||
: CActor(uid, active, "Fire", CEntityInfo(area, NullConnectionList), xf,
|
||||
CModelData::CModelDataNull(), CMaterialList(kMT_Projectile), CActorParameters::None(),
|
||||
kInvalidUniqueId)
|
||||
@ -51,9 +51,10 @@ void CFire::Touch(CActor& act, CStateManager& mgr) {
|
||||
return;
|
||||
}
|
||||
|
||||
mgr.ApplyDamage(GetUniqueId(), act.GetUniqueId(), GetUniqueId(), x10c_damageInfo2,
|
||||
CMaterialFilter::MakeIncludeExclude(CMaterialList(SolidMaterial), CMaterialList()),
|
||||
CVector3f::Zero());
|
||||
mgr.ApplyDamage(
|
||||
GetUniqueId(), act.GetUniqueId(), GetUniqueId(), x10c_damageInfo2,
|
||||
CMaterialFilter::MakeIncludeExclude(CMaterialList(SolidMaterial), CMaterialList()),
|
||||
CVector3f::Zero());
|
||||
}
|
||||
|
||||
rstl::optional_object< CAABox > CFire::GetTouchBounds() const {
|
||||
|
@ -2,14 +2,15 @@
|
||||
|
||||
#include "MetroidPrime/CActorParameters.hpp"
|
||||
|
||||
CRepulsor::CRepulsor(TUniqueId uid, bool active, const rstl::string& name, const CEntityInfo& info,
|
||||
const CVector3f& pos, float radius)
|
||||
: CActor(uid, active, name, info, CTransform4f::Translate(pos), CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
CRepulsor::CRepulsor(TUniqueId uid, const bool active, const rstl::string& name,
|
||||
const CEntityInfo& info, const CVector3f& pos, float radius)
|
||||
: CActor(uid, active, name, info, CTransform4f::Translate(pos), CModelData::CModelDataNull(),
|
||||
CMaterialList(kMT_NoStepLogic), CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_affectRadius(radius) {}
|
||||
|
||||
void CRepulsor::Accept(IVisitor& visitor) { visitor.Visit(*this); }
|
||||
|
||||
void CRepulsor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) {
|
||||
void CRepulsor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
|
||||
CStateManager& stateMgr) {
|
||||
CActor::AcceptScriptMsg(msg, objId, stateMgr);
|
||||
}
|
||||
|
@ -4,8 +4,8 @@
|
||||
#include "MetroidPrime/ScriptObjects/CScriptWaypoint.hpp"
|
||||
|
||||
CScriptAiJumpPoint::CScriptAiJumpPoint(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf, bool active,
|
||||
float apex)
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
const bool active, float apex)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_apex(apex)
|
||||
@ -50,8 +50,7 @@ void CScriptAiJumpPoint::Think(float dt, CStateManager&) {
|
||||
}
|
||||
}
|
||||
|
||||
void CScriptAiJumpPoint::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const {
|
||||
}
|
||||
void CScriptAiJumpPoint::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const {}
|
||||
|
||||
void CScriptAiJumpPoint::Render(const CStateManager&) const {}
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
#include "MetroidPrime/Weapons/CPlasmaProjectile.hpp"
|
||||
|
||||
CScriptBeam::CScriptBeam(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
|
||||
const CTransform4f& xf, bool active,
|
||||
const CTransform4f& xf, const bool active,
|
||||
const TToken< CWeaponDescription >& weaponDesc, const CBeamInfo& bInfo,
|
||||
const CDamageInfo& dInfo)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(),
|
||||
|
@ -34,7 +34,7 @@ CCameraOverrideInfo::CCameraOverrideInfo(
|
||||
|
||||
CScriptCameraHint::CScriptCameraHint(
|
||||
TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf,
|
||||
bool active, int priority, CBallCamera::EBallCameraBehaviour behavior, int overrideFlags,
|
||||
const bool active, int priority, CBallCamera::EBallCameraBehaviour behavior, int overrideFlags,
|
||||
float minDist, float maxDist, float backwardsDist, const CVector3f& lookAtOffset,
|
||||
const CVector3f& chaseLookAtOffset, const CVector3f& ballToCam, float fov, float attitudeRange,
|
||||
float azimuthRange, float anglePerSecond, float clampVelRange, float clampRotRange,
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
#include "MetroidPrime/CActorParameters.hpp"
|
||||
|
||||
CScriptCameraHintTrigger::CScriptCameraHintTrigger(TUniqueId uid, bool active,
|
||||
CScriptCameraHintTrigger::CScriptCameraHintTrigger(TUniqueId uid, const bool active,
|
||||
const rstl::string& name,
|
||||
const CEntityInfo& info, const CVector3f& scale,
|
||||
const CTransform4f& xf, bool deactivateOnEnter,
|
||||
@ -12,10 +12,9 @@ CScriptCameraHintTrigger::CScriptCameraHintTrigger(TUniqueId uid, bool active,
|
||||
, xe8_obb(xf, scale)
|
||||
, x124_scale(scale)
|
||||
, x130_24_deactivateOnEnter(deactivateOnEnter)
|
||||
, x130_25_deactivateOnExit(deactivateOnExit)
|
||||
, x130_25_deactivateOnExit(deactivateOnExit)
|
||||
, x130_26_playerInside(false)
|
||||
, x130_27_playerWasInside(false)
|
||||
{}
|
||||
, x130_27_playerWasInside(false) {}
|
||||
|
||||
void CScriptCameraHintTrigger::Accept(IVisitor& visitor) { visitor.Visit(*this); }
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
const CVector3f CScriptCameraPitchVolume::skScaleFactor(0.5f, 0.5f, 0.5f);
|
||||
|
||||
CScriptCameraPitchVolume::CScriptCameraPitchVolume(TUniqueId uid, bool active,
|
||||
CScriptCameraPitchVolume::CScriptCameraPitchVolume(TUniqueId uid, const bool active,
|
||||
const rstl::string& name,
|
||||
const CEntityInfo& info, const CVector3f& scale,
|
||||
const CTransform4f& xf, const CRelAngle& upPitch,
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
CScriptCameraWaypoint::CScriptCameraWaypoint(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
bool active, float hfov, uint w1)
|
||||
const bool active, float hfov, uint w1)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_hfov(hfov)
|
||||
|
@ -5,9 +5,9 @@
|
||||
#include "Kyoto/Math/CUnitVector3f.hpp"
|
||||
|
||||
CScriptCoverPoint::CScriptCoverPoint(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf, bool active,
|
||||
uint flags, bool crouch, float horizontalAngle,
|
||||
float verticalAngle, float coverTime)
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
const bool active, uint flags, bool crouch,
|
||||
float horizontalAngle, float verticalAngle, float coverTime)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_flags(flags)
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include "Kyoto/Particles/CGenDescription.hpp"
|
||||
|
||||
CScriptEMPulse::CScriptEMPulse(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
|
||||
const CTransform4f& xf, bool active, float initialRadius,
|
||||
const CTransform4f& xf, const bool active, float initialRadius,
|
||||
float finalRadius, float duration, float interferenceDur, float f5,
|
||||
float interferenceMag, float f7, CAssetId partId)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_Projectile),
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
CScriptGrapplePoint::CScriptGrapplePoint(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
bool active, const CGrappleParameters& params)
|
||||
const bool active, const CGrappleParameters& params)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_Orbit),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_touchBounds(GetTranslation() - CVector3f(0.5f, 0.5f, 0.5f),
|
||||
|
@ -238,8 +238,8 @@ void CSinglePathMaze::SolveMaze() {
|
||||
}
|
||||
|
||||
CScriptMazeNode::CScriptMazeNode(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
|
||||
const CTransform4f& xf, bool active, int col, int row, int side,
|
||||
const CVector3f& actorPos, const CVector3f& triggerPos,
|
||||
const CTransform4f& xf, const bool active, int col, int row,
|
||||
int side, const CVector3f& actorPos, const CVector3f& triggerPos,
|
||||
const CVector3f& effectPos)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
|
@ -8,8 +8,8 @@
|
||||
#include "rstl/algorithm.hpp"
|
||||
|
||||
CScriptPlayerHint::CScriptPlayerHint(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf, bool active,
|
||||
int priority, int overrideFlags)
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
const bool active, int priority, int overrideFlags)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xfc_deactivated(false)
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
CScriptPointOfInterest::CScriptPointOfInterest(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
bool active, const CScannableParameters& parms,
|
||||
const bool active, const CScannableParameters& parms,
|
||||
float f1)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_Orbit),
|
||||
CActorParameters::None().Scannable(parms), kInvalidUniqueId)
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
CScriptShadowProjector::CScriptShadowProjector(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
bool active, const CVector3f& offset,
|
||||
const bool active, const CVector3f& offset,
|
||||
bool persistent, float scale, float f2,
|
||||
float opacity, float opacityQ, int textureSize)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(),
|
||||
|
@ -18,7 +18,7 @@
|
||||
bool CScriptSound::sFirstInFrame = false;
|
||||
|
||||
CScriptSound::CScriptSound(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
|
||||
const CTransform4f& xf, const ushort soundId, bool active,
|
||||
const CTransform4f& xf, const ushort soundId, const bool active,
|
||||
const float maxDist, const float distComp, const float startDelay,
|
||||
const uint minVol, const uint vol, const uint w3, const uint prio,
|
||||
const uint pan, const uint w6, const bool looped, const bool nonEmitter,
|
||||
|
@ -45,7 +45,7 @@ static int string_find(const string& haystack, const string& needle, int) {
|
||||
CScriptSpecialFunction::CScriptSpecialFunction(
|
||||
TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf,
|
||||
ESpecialFunction func, const rstl::string& lcName, float f1, float f2, float f3, float f4,
|
||||
const CVector3f& vec, const CColor& col, bool active, const CDamageInfo& dInfo, int aId1,
|
||||
const CVector3f& vec, const CColor& col, const bool active, const CDamageInfo& dInfo, int aId1,
|
||||
int aId2, CPlayerState::EItemType itemType, ushort sId1, ushort sId2, ushort sId3)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
CScriptSpiderBallAttractionSurface::CScriptSpiderBallAttractionSurface(
|
||||
TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf,
|
||||
const CVector3f& scale, bool active)
|
||||
const CVector3f& scale, const bool active)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_scale(scale)
|
||||
|
@ -0,0 +1,9 @@
|
||||
#include "MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.hpp"
|
||||
#include "MetroidPrime/CActorParameters.hpp"
|
||||
|
||||
CScriptSpiderBallWaypoint::CScriptSpiderBallWaypoint(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info,
|
||||
const CTransform4f& xf, const bool active,
|
||||
uint w1)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId) {}
|
@ -4,7 +4,7 @@
|
||||
|
||||
CScriptTargetingPoint::CScriptTargetingPoint(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, const CTransform4f& xf,
|
||||
bool active)
|
||||
const bool active)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_e4_(false)
|
||||
@ -13,19 +13,18 @@ CScriptTargetingPoint::CScriptTargetingPoint(TUniqueId uid, const rstl::string&
|
||||
|
||||
void CScriptTargetingPoint::Accept(IVisitor& visitor) { visitor.Visit(*this); }
|
||||
|
||||
void CScriptTargetingPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
|
||||
void CScriptTargetingPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
|
||||
CStateManager& mgr) {
|
||||
CActor::AcceptScriptMsg(msg, uid, mgr);
|
||||
|
||||
switch (msg) {
|
||||
case kSM_Deactivate:
|
||||
case kSM_Activate:
|
||||
CEntity::SendScriptMsgs(kSS_Attack, mgr, kSM_None);
|
||||
case kSM_Deactivate:
|
||||
case kSM_Activate:
|
||||
CEntity::SendScriptMsgs(kSS_Attack, mgr, kSM_None);
|
||||
}
|
||||
}
|
||||
|
||||
bool CScriptTargetingPoint::GetLocked() const {
|
||||
return GetConnectionList().size() > 0;
|
||||
}
|
||||
bool CScriptTargetingPoint::GetLocked() const { return GetConnectionList().size() > 0; }
|
||||
|
||||
void CScriptTargetingPoint::Think(float dt, CStateManager&) {
|
||||
if (xec_time > 0.f) {
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
CScriptTrigger::CScriptTrigger(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
|
||||
const CVector3f& pos, const CAABox& bounds, const CDamageInfo& dInfo,
|
||||
const CVector3f& forceField, uint triggerFlags, bool active,
|
||||
const CVector3f& forceField, uint triggerFlags, const bool active,
|
||||
bool deactivateOnEntered, bool deactivateOnExited)
|
||||
: CActor(uid, active, name, info, CTransform4f::Translate(pos), CModelData::CModelDataNull(),
|
||||
CMaterialList(kMT_Trigger), CActorParameters::None(), kInvalidUniqueId)
|
||||
|
@ -8,9 +8,9 @@
|
||||
#pragma inline_max_size(200)
|
||||
|
||||
CScriptVisorFlare::CScriptVisorFlare(TUniqueId uid, const rstl::string& name,
|
||||
const CEntityInfo& info, bool active, const CVector3f& pos,
|
||||
CVisorFlare::EBlendMode blendMode, bool b1, float f1, float f2,
|
||||
float f3, uint w1, uint w2,
|
||||
const CEntityInfo& info, const bool active,
|
||||
const CVector3f& pos, CVisorFlare::EBlendMode blendMode,
|
||||
bool b1, float f1, float f2, float f3, uint w1, uint w2,
|
||||
const rstl::vector< CVisorFlare::CFlareDef >& flares)
|
||||
: CActor(uid, active, name, info, CTransform4f::Translate(pos), CModelData::CModelDataNull(),
|
||||
CMaterialList(kMT_NoStepLogic), CActorParameters::None(), kInvalidUniqueId)
|
||||
|
@ -14,7 +14,7 @@ CScriptVisorGoo::CScriptVisorGoo(TUniqueId uid, const rstl::string& name, const
|
||||
const CTransform4f& xf, CAssetId particle, CAssetId electric,
|
||||
float minRange, float maxRange, float chanceMinRange,
|
||||
float chanceMaxRange, const CColor& color, int sfx,
|
||||
bool noViewCheck, bool active)
|
||||
bool noViewCheck, const bool active)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_particleDesc(nullptr)
|
||||
|
@ -4,12 +4,12 @@
|
||||
#include "MetroidPrime/CStateManager.hpp"
|
||||
|
||||
CScriptWaypoint::CScriptWaypoint(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
|
||||
const CTransform4f& xf, bool active, float speed, float pause,
|
||||
int patternTranslate, int patternOrient, int patternFit,
|
||||
int behaviour, int behaviourOrient, int behaviourModifiers,
|
||||
uint animation)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic), CActorParameters::None(),
|
||||
kInvalidUniqueId)
|
||||
const CTransform4f& xf, const bool active, float speed,
|
||||
float pause, int patternTranslate, int patternOrient,
|
||||
int patternFit, int behaviour, int behaviourOrient,
|
||||
int behaviourModifiers, uint animation)
|
||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
|
||||
CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_speed(speed)
|
||||
, xec_animation(animation)
|
||||
, xf0_pause(pause)
|
||||
|
@ -7,10 +7,10 @@
|
||||
|
||||
#include <rstl/math.hpp>
|
||||
|
||||
CWeapon::CWeapon(TUniqueId uid, TAreaId areaId, bool active, TUniqueId owner, EWeaponType type,
|
||||
const rstl::string& name, const CTransform4f& xf, const CMaterialFilter& filter,
|
||||
const CMaterialList& mList, const CDamageInfo& dInfo, int attribs,
|
||||
const CModelData& mData)
|
||||
CWeapon::CWeapon(TUniqueId uid, TAreaId areaId, const bool active, TUniqueId owner,
|
||||
EWeaponType type, const rstl::string& name, const CTransform4f& xf,
|
||||
const CMaterialFilter& filter, const CMaterialList& mList,
|
||||
const CDamageInfo& dInfo, int attribs, const CModelData& mData)
|
||||
: CActor(uid, active, name, CEntityInfo(areaId, CEntity::NullConnectionList), xf, mData, mList,
|
||||
CActorParameters::None().HotInThermal(true), kInvalidUniqueId)
|
||||
, xe8_projectileAttribs(attribs)
|
||||
|
Loading…
x
Reference in New Issue
Block a user