summaryrefslogtreecommitdiff
path: root/src/REL/d/a/e
diff options
context:
space:
mode:
Diffstat (limited to 'src/REL/d/a/e')
-rw-r--r--src/REL/d/a/e/d_a_e_hb_leaf.cpp2
-rw-r--r--src/REL/d/a/e/d_a_e_ks.cpp34
-rw-r--r--src/REL/d/a/e/d_a_e_remly.cpp56
-rw-r--r--src/REL/d/a/e/d_a_e_skytail.cpp8
-rw-r--r--src/REL/d/a/e/d_a_e_sm.cpp10
5 files changed, 53 insertions, 57 deletions
diff --git a/src/REL/d/a/e/d_a_e_hb_leaf.cpp b/src/REL/d/a/e/d_a_e_hb_leaf.cpp
index 92047ba0..7c7e7003 100644
--- a/src/REL/d/a/e/d_a_e_hb_leaf.cpp
+++ b/src/REL/d/a/e/d_a_e_hb_leaf.cpp
@@ -87,7 +87,7 @@ int dAcEhb_leaf_c::actorExecute() {
int dAcEhb_leaf_c::draw() {
if (!isHidden()) {
- drawModelType1(&mModel.getModel());
+ drawModel(&mModel.getModel());
}
return SUCCEEDED;
diff --git a/src/REL/d/a/e/d_a_e_ks.cpp b/src/REL/d/a/e/d_a_e_ks.cpp
index ef18a9dc..e5d99fae 100644
--- a/src/REL/d/a/e/d_a_e_ks.cpp
+++ b/src/REL/d/a/e/d_a_e_ks.cpp
@@ -330,7 +330,7 @@ void dAcEKs_c::fn_155_A60() {
}
mSpeed = 65.f;
mAcchCir.SetWall(20.f, 60.f);
- mAcceleration = -6.f;
+ mGravity = -6.f;
field_0xD5E = 5;
mAcch.SetGroundUpY(0.f);
@@ -361,7 +361,7 @@ void dAcEKs_c::fn_155_A60() {
field_0xDA9 = 1;
}
if (mHealth == 0) {
- mAcceleration = -4.f;
+ mGravity = -4.f;
field_0xD92 = field_0xD98 * 0.2f;
field_0xD94 = field_0xD96 * 0.1f;
}
@@ -374,7 +374,7 @@ void dAcEKs_c::fn_155_A60() {
if (mHealth == 0) {
mSpeed = 65.f;
mAcchCir.SetWall(20, 60);
- mAcceleration = -6.f;
+ mGravity = -6.f;
field_0xD5E = 5;
mAcch.SetGroundUpY(0);
unsetActorProperty(AC_PROP_0x1);
@@ -1342,8 +1342,8 @@ int dAcEKs_c::actorCreate() {
mSph.Set(sSrcSph);
mSph.SetStts(mStts);
- mAcceleration = 0.f;
- mMaxSpeed = -40.f;
+ mGravity = 0.f;
+ mMaxFallSpeed = -40.f;
setStartingPosition(mPosition);
field_0xBE0 = mPosition;
@@ -1747,7 +1747,7 @@ int dAcEKs_c::draw() {
}
}
- drawModelType1(&mMdl.getModel());
+ drawModel(&mMdl.getModel());
if (!isState(StateID_Wait)) {
field_0xD18 = mPosition.y - mAcch.GetGroundH();
@@ -1757,7 +1757,7 @@ int dAcEKs_c::draw() {
50.f + dAcEKs_HIO_c::sInstance.getZero1()
);
field_0xAE4.transS(mPosition);
- drawShadow(mShadow, nullptr, field_0xAE4, &sph, -1, -1, -1, -1, -1, field_0xD18);
+ drawShadow(mShadow, nullptr, field_0xAE4, sph, -1, -1, -1, -1, -1, field_0xD18);
}
return SUCCEEDED;
@@ -2635,7 +2635,7 @@ void dAcEKs_c::executeState_Damage() {
}
if (mAcch.ChkGroundLanding() && field_0xDB5 != 0) {
- dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0);
+ dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
field_0xDB5 = 0;
}
@@ -2688,7 +2688,7 @@ void dAcEKs_c::initializeState_Stun() {
field_0xDA5 = 0;
mAngle.y = cLib::targetAngleY(dAcPy_c::GetLink()->mPosition, mPosition);
mSpeed = 30.f;
- mAcceleration = -2.5f;
+ mGravity = -2.5f;
field_0xD5C = 5;
mStunSoundTimer = cM::rndInt(20) + 20;
mAcch.SetGroundUpY(0);
@@ -2729,17 +2729,13 @@ void dAcEKs_c::executeState_Stun() {
}
if (mAcch.ChkGndHit()) {
if (field_0xDB5 != 0) {
- dJEffManager_c::spawnGroundEffect(
- mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0
- );
+ dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
field_0xDB5 = 0;
}
field_0xD5C = 0;
field_0xDA9 = 1;
if (dBgS::GetInstance()->GetSpecialCode(mAcch.GetGnd()) == POLY_ATTR_LAVA) {
- dJEffManager_c::spawnGroundEffect(
- mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0
- );
+ dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
resetInteractionFlags(0x1);
startSound(SE_EKs_V_DEATH2);
unsetActorProperty(AC_PROP_0x1);
@@ -2822,7 +2818,7 @@ void dAcEKs_c::executeState_Stun() {
}
void dAcEKs_c::finalizeState_Stun() {
field_0xC10.y = 0.f;
- mAcceleration = 0.f;
+ mGravity = 0.f;
mSph.OnCoSet();
resetInteractionFlags(0x1);
if (mType == EKS_FIRE) {
@@ -2853,7 +2849,7 @@ void dAcEKs_c::initializeState_WindBlow() {
field_0xD20 = 0.f;
mLightInfluence.SetScale(0);
}
- mAcceleration = -0.5f;
+ mGravity = -0.5f;
mAcch.ClrRoofNone();
mAcchCir.SetWall(20, 60);
mAcch.SetRoofCrrHeight(55);
@@ -2869,7 +2865,7 @@ void dAcEKs_c::executeState_WindBlow() {
}
if (mAcch.ChkGroundLanding() && dBgS::GetInstance()->GetSpecialCode(mAcch.GetGnd()) == POLY_ATTR_LAVA) {
- dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0);
+ dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
startSound(SE_EKs_V_DEATH2);
unsetActorProperty(AC_PROP_0x1);
kill(false);
@@ -2945,7 +2941,7 @@ void dAcEKs_c::executeState_WindBlow() {
}
void dAcEKs_c::finalizeState_WindBlow() {
mSpeed = 0.f;
- mAcceleration = 0.f;
+ mGravity = 0.f;
mVelocity.y = 0.f;
mRotation.x = 0;
mAngle.set(mRotation);
diff --git a/src/REL/d/a/e/d_a_e_remly.cpp b/src/REL/d/a/e/d_a_e_remly.cpp
index 7ce91edf..b1033146 100644
--- a/src/REL/d/a/e/d_a_e_remly.cpp
+++ b/src/REL/d/a/e/d_a_e_remly.cpp
@@ -164,8 +164,8 @@ int dAcEremly_c::actorCreate() {
mBoundingBox.Set(mVec3_c(-150.f, -700.f, -150.f), mVec3_c(150.f, 150.f, 150.f));
- mAcceleration = -3.f;
- mMaxSpeed = -60.f;
+ mGravity = -3.f;
+ mMaxFallSpeed = -60.f;
mScale.set(1.f, 1.f, 1.f);
mScaleF = 1.f;
@@ -477,7 +477,7 @@ int dAcEremly_c::actorExecute() {
}
} else {
mSlopeXTarget = mSlopeZTarget = 0;
- mYPosition = mPosition.y + mYOffset;
+ mYPosition = mPosition.y + mSinkDepth;
}
if (!isUnderWater() && isState(StateID_Water)) {
@@ -575,17 +575,17 @@ int dAcEremly_c::draw() {
}
m3d::smdl_c &mdl = mMdl.getModel();
- drawModelType1(&mdl);
+ drawModel(&mdl);
static mSphere_c sph(mVec3_c(0.f, getValue0(), 0.f), _weird_zero + 290.f);
- fn_8002edb0(mShadow, mdl, &sph, -1, -1, mPosition.y - mAcch.GetGroundH());
+ drawShadow(mShadow, mdl, sph, -1, -1, mPosition.y - mAcch.GetGroundH());
return SUCCEEDED;
}
void dAcEremly_c::initializeState_Wait() {
mSomeCounter = 0;
- mAcceleration = -3.f;
+ mGravity = -3.f;
checkSlope(true);
@@ -833,7 +833,7 @@ void dAcEremly_c::finalizeState_Run() {}
void dAcEremly_c::initializeState_Escape() {
field_0xB6E = 0;
- mAcceleration = -3.f;
+ mGravity = -3.f;
mMdl.setAnm("RemlyRun", m3d::PLAY_MODE_4, 4.f);
mAnimation = ANM_Run;
mMdl.setRate(2.f);
@@ -965,7 +965,7 @@ void dAcEremly_c::initializeState_Hold() {
mAnimation = ANM_Hold;
mSph.ClrCoSet();
- mYOffset = 0.f;
+ mSinkDepth = 0.f;
mYPosition = mPosition.y;
field_0xB6A = 0;
@@ -993,7 +993,7 @@ void dAcEremly_c::initializeState_Hold() {
mLinkage.field_0x8C = 13.f + _weird_zero;
}
- mAcceleration = -1.75f + _weird_zero;
+ mGravity = -1.75f + _weird_zero;
mAnimTimer = 64.f + cM::rndF(64.f);
mAnimSafeTimer = 90;
}
@@ -1028,14 +1028,14 @@ void dAcEremly_c::executeState_Hold() {
}
if (isScary()) {
- mAcceleration = -3.f;
+ mGravity = -3.f;
changeState(StateID_NightFoo);
} else if (field_0xB68 == 0) {
- mAcceleration = -3.f;
+ mGravity = -3.f;
mAnimTimer = 0;
changeState(StateID_Wait);
} else {
- mAcceleration = -3.f;
+ mGravity = -3.f;
changeState(StateID_EscapeDash);
}
}
@@ -1068,7 +1068,7 @@ void dAcEremly_c::executeState_Jump() {
if (mAcch.ChkGndHit() && mMdl.getAnm().isStop()) {
mAngle.y = mRotation.y;
setActorProperty(AC_PROP_0x1);
- mAcceleration = -3.f;
+ mGravity = -3.f;
if (isScary()) {
changeState(StateID_NightFoo);
@@ -1109,7 +1109,7 @@ void dAcEremly_c::initializeState_Fly() {
f32 f = 200.f + _weird_zero;
- mYOffset = 0.f;
+ mSinkDepth = 0.f;
mAnmStep = 0;
mAcch.SetRoofCrrHeight(f);
@@ -1157,11 +1157,11 @@ void dAcEremly_c::executeState_Fly() {
switch (mAnmStep) {
default: {
sLib::addCalcScaledDiff(&mVelocity.y, 8.f, 0.7f, 2.f);
- sLib::addCalcScaled(&mAcceleration, 0.7f, 2.f);
+ sLib::addCalcScaled(&mGravity, 0.7f, 2.f);
sLib::addCalcAngle(mAngle.y.ref(), getXZAngleToPlayer(), 2, 0x800);
sLib::addCalcAngle(mRotation.y.ref(), mAngle.y, 2, 0x800);
if (mStartingPos.y + 300.f < mPosition.y) {
- mAcceleration = 0.f;
+ mGravity = 0.f;
mVelocity.y = 0.f;
mAnmStep++;
}
@@ -1180,7 +1180,7 @@ void dAcEremly_c::executeState_Fly() {
} else {
targetSpeed = 0.f;
}
- sLib::addCalcScaledDiff(&mYOffset, targetSpeed, 0.5f, 10.f);
+ sLib::addCalcScaledDiff(&mSinkDepth, targetSpeed, 0.5f, 10.f);
if (mSomeCounter < 120 && mStartingPos.squareDistanceToXZ(mPosition) > 2500.f) {
s32 angle = ++mFlyAngleCounter * 300;
@@ -1196,7 +1196,7 @@ void dAcEremly_c::executeState_Fly() {
mSomeCounter++;
}
} else {
- mAcceleration = 0.f;
+ mGravity = 0.f;
mVelocity.y = 0.f;
mSomeCounter = 0;
}
@@ -1211,8 +1211,8 @@ void dAcEremly_c::executeState_Fly() {
return;
}
if (mAcch.ChkGndHit()) {
- mYOffset = 0.f;
- mAcceleration = -3.f;
+ mSinkDepth = 0.f;
+ mGravity = -3.f;
mSpeed = 0.f;
mAnmStep++;
mAcch.SetRoofNone();
@@ -1250,7 +1250,7 @@ void dAcEremly_c::finalizeState_Fly() {}
void dAcEremly_c::initializeState_Damage() {
mSomeCounter = 0;
- mAcceleration = -3.f;
+ mGravity = -3.f;
if (mAnimation == ANM_Scared) {
mSomeCounter = 1;
}
@@ -1378,7 +1378,7 @@ void dAcEremly_c::finalizeState_Scared() {}
void dAcEremly_c::initializeState_Stun() {
field_0xB6B = false;
- mAcceleration = -3.f;
+ mGravity = -3.f;
if (mAnimation != ANM_Piyo1 && mAnimation != ANM_Piyo2) {
mMdl.setAnm("RemlyPiyo1", m3d::PLAY_MODE_4, 4.f);
mAnimation = ANM_Piyo1;
@@ -1455,7 +1455,7 @@ void dAcEremly_c::initializeState_Water() {
mMdl.setAnm("RemlySwim", m3d::PLAY_MODE_4, 4.f);
mAnimation = ANM_Swim;
field_0xB6B = false;
- mAcceleration = 0.f;
+ mGravity = 0.f;
mSpeed = 0.f;
mSph.ClrAtSet();
field_0xB68 = 0;
@@ -1488,14 +1488,14 @@ void dAcEremly_c::executeState_Water() {
field_0xB6F = 1;
} else if (field_0xB6F) {
mStts.SetRank(5);
- mAcceleration = -3.f;
+ mGravity = -3.f;
if ((s32)++mNoGroundCounter > 30) {
changeState(StateID_Fly);
}
} else {
mSpeed = 0.f;
- mAcceleration = -3.f;
+ mGravity = -3.f;
mStts.SetRank(5);
if (mAnimation != ANM_SwimDamage && mAnimation != ANM_Water) {
@@ -1798,7 +1798,7 @@ void dAcEremly_c::initializeState_NightRun() {
mSomeCounter2 = 0;
field_0xB6B = false;
mSph.ClrAtSet();
- mAcceleration = -3.f;
+ mGravity = -3.f;
mMdl.setRate(1.5f);
mAnimTimer = 0;
fn_177_77C0();
@@ -1952,7 +1952,7 @@ void dAcEremly_c::executeState_BirthWait() {
mPosition.y += 10.f;
mVelocity.set(0.f, 0.f, 0.f);
mSpeed = 0.f;
- mAcceleration = -3.f;
+ mGravity = -3.f;
setActorProperty(AC_PROP_0x1);
if (isScary()) {
@@ -2482,7 +2482,7 @@ void dAcEremly_c::spawnGroundEffect() {
m.multVec(in, out);
out += mPosition;
- dJEffManager_c::spawnGroundEffect(out, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, mScale.x * 0.7f, field_0x1B0);
+ dJEffManager_c::spawnGroundEffect(out, mPolyAttr0, mPolyAttr1, mGndNormal, 1, mScale.x * 0.7f, field_0x1B0);
}
bool dAcEremly_c::fn_177_86C0() {
diff --git a/src/REL/d/a/e/d_a_e_skytail.cpp b/src/REL/d/a/e/d_a_e_skytail.cpp
index c10fb31d..02a945fc 100644
--- a/src/REL/d/a/e/d_a_e_skytail.cpp
+++ b/src/REL/d/a/e/d_a_e_skytail.cpp
@@ -270,8 +270,8 @@ int dAcESkytail_c::create() {
for (int i = 0; i < (s32)ARRAY_LENGTH(mCc); ++i) {
mCc[i].SetC(mPosition);
}
- mAcceleration = -0.0f;
- mMaxSpeed = -80.0f;
+ mGravity = -0.0f;
+ mMaxFallSpeed = -80.0f;
mHealth = 4;
mSpeed = 70.0f;
field_0x13B6 = 0;
@@ -524,9 +524,9 @@ int dAcESkytail_c::actorExecute() {
}
int dAcESkytail_c::draw() {
- drawModelType1(&mBodyMdl.getModel());
+ drawModel(&mBodyMdl.getModel());
for (int i = 0; i < (s32)ARRAY_LENGTH(mAntennaMdl); ++i) {
- drawModelType1(&mAntennaMdl[i].getModel());
+ drawModel(&mAntennaMdl[i].getModel());
}
return SUCCEEDED;
}
diff --git a/src/REL/d/a/e/d_a_e_sm.cpp b/src/REL/d/a/e/d_a_e_sm.cpp
index 2ae4bdc2..a3f3142b 100644
--- a/src/REL/d/a/e/d_a_e_sm.cpp
+++ b/src/REL/d/a/e/d_a_e_sm.cpp
@@ -166,7 +166,7 @@ int dAcEsm_c::actorCreate() {
mObjAcch.SetGndThinCellingOff();
mObjAcch.SetWtrChkMode(1);
- mMaxSpeed = -40.f;
+ mMaxFallSpeed = -40.f;
mSph.Set(sSphSrc);
@@ -220,7 +220,7 @@ int dAcEsm_c::actorCreate() {
mHealth = 100;
if (field_0xBBF != 1) {
- mAcceleration = -3.f;
+ mGravity = -3.f;
}
calcVelocity();
mPosition += mVelocity;
@@ -718,7 +718,7 @@ int dAcEsm_c::draw() {
return SUCCEEDED;
}
- drawModelType1(&mMdl.getModel());
+ drawModel(&mMdl.getModel());
if (mHealth == 0) {
return SUCCEEDED;
@@ -726,7 +726,7 @@ int dAcEsm_c::draw() {
s8 var = 0;
mSphere_c sph(mVec3_c(0.f, 50.f, 0.f), mScale.x * (var + 240.f));
- drawShadow(mShadowCircle, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
+ drawShadow(mShadowCircle, nullptr, mWorldMtx, sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
return SUCCEEDED;
}
@@ -772,7 +772,7 @@ void dAcEsm_c::initializeState_Walk() {
field_0xBAA = mAngle.y;
field_0xBA8 = 0;
field_0xBCB = 0;
- mAcceleration = -3.f;
+ mGravity = -3.f;
}
void dAcEsm_c::executeState_Walk() {
field_0xBA6 += (s16)(1000.f + field_0xB70 / mScaleTarget.x);
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-14 08:36:58 +0000