summaryrefslogtreecommitdiff
path: root/src/REL/d/a/npc
diff options
context:
space:
mode:
authorElijah Thomas <42302100+elijah-thomas774@users.noreply.github.com>2026-10-19 22:56:23 -0400
committerGitHub <noreply@github.com>2026-10-19 22:56:23 -0400
commit96f2dd5497c4ceb595de76fd897fbb1542b27323 (patch)
treeab6c520aa8554d24c86a3a91ff33937cf4732736 /src/REL/d/a/npc
parentfcb030b4813c35d530ffa3d8f6e6a7fcb3788a89 (diff)
parente644d260791911cd0e919575ce842f3e4fe50356 (diff)
Merge pull request #367 from elijah-thomas774/basesHEADmain
d_a_obj_base OK
Diffstat (limited to 'src/REL/d/a/npc')
-rw-r--r--src/REL/d/a/npc/d_a_npc_honeycomb.cpp6
-rw-r--r--src/REL/d/a/npc/d_a_npc_rival_lod.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/REL/d/a/npc/d_a_npc_honeycomb.cpp b/src/REL/d/a/npc/d_a_npc_honeycomb.cpp
index c0896360..1d09e0a3 100644
--- a/src/REL/d/a/npc/d_a_npc_honeycomb.cpp
+++ b/src/REL/d/a/npc/d_a_npc_honeycomb.cpp
@@ -53,8 +53,8 @@ int dAcNpcHc_c::create() {
mCollider.addCc(mSph, srcSph);
mStts.SetRank(8);
mCollider.SetStts(mStts);
- mAcceleration = -5.f;
- mMaxSpeed = -50.f;
+ mGravity = -5.f;
+ mMaxFallSpeed = -50.f;
mBoundingBox.Set(mVec3_c(-200.f, -200.f, -200.f), mVec3_c(200.f, 200.f, 200.f));
mRandomnessTimer = cM::rndF(65536.f);
field_0x934 = mPosition;
@@ -268,7 +268,7 @@ int dAcNpcHc_c::actorExecute() {
int dAcNpcHc_c::draw() {
if (mDeathTimer == 0) {
- drawModelType1(&mModel);
+ drawModel(&mModel);
}
return SUCCEEDED;
}
diff --git a/src/REL/d/a/npc/d_a_npc_rival_lod.cpp b/src/REL/d/a/npc/d_a_npc_rival_lod.cpp
index 5b727b57..768438aa 100644
--- a/src/REL/d/a/npc/d_a_npc_rival_lod.cpp
+++ b/src/REL/d/a/npc/d_a_npc_rival_lod.cpp
@@ -16,8 +16,8 @@ bool dAcNpcRivalLOD_c::createHeap() {
int dAcNpcRivalLOD_c::create() {
CREATE_ALLOCATOR(dAcNpcRivalLOD_c);
0.0f; // float order, cool
- mAcceleration = -1.0f;
- mMaxSpeed = -40.0f;
+ mGravity = -1.0f;
+ mMaxFallSpeed = -40.0f;
setState(StateID_Wait);
mBoundingBox.Set(mVec3_c(-110.0f, -30.0f, -130.0f), mVec3_c(130.0f, 190.0f, 110.0f));
return SUCCEEDED;
@@ -35,7 +35,7 @@ int dAcNpcRivalLOD_c::actorExecute() {
}
int dAcNpcRivalLOD_c::draw() {
- drawModelType1(&mMdl.getModel());
+ drawModel(&mMdl.getModel());
return SUCCEEDED;
}