summaryrefslogtreecommitdiff
path: root/src/toBeSorted
diff options
context:
space:
mode:
Diffstat (limited to 'src/toBeSorted')
-rw-r--r--src/toBeSorted/d_enemy_sword_mdl.cpp4
-rw-r--r--src/toBeSorted/item_mdl_item.cpp4
-rw-r--r--src/toBeSorted/item_mdl_light_fruit.cpp5
-rw-r--r--src/toBeSorted/item_mdl_misc.cpp24
-rw-r--r--src/toBeSorted/item_mdl_rupee.cpp5
-rw-r--r--src/toBeSorted/item_mdl_stamina_fruit.cpp4
6 files changed, 22 insertions, 24 deletions
diff --git a/src/toBeSorted/d_enemy_sword_mdl.cpp b/src/toBeSorted/d_enemy_sword_mdl.cpp
index cf76bf8c..a6f51390 100644
--- a/src/toBeSorted/d_enemy_sword_mdl.cpp
+++ b/src/toBeSorted/d_enemy_sword_mdl.cpp
@@ -121,9 +121,9 @@ void dEnemySwordMdl_c::calc(const mMtx_c &mtx, const mVec3_c &v1, bool mass) {
bool dEnemySwordMdl_c::entry(dAcObjBase_c *obj, dShadowCircle_c *shadow, mSphere_c *sph) {
if (dScGame_c::currentSpawnInfo.getTrial() == SpawnInfo::TRIAL) {
- obj->fn_8002ECD0(&mMdl, 7);
+ obj->drawModel(&mMdl, 7);
} else {
- obj->drawModelType1(&mMdl);
+ obj->drawModel(&mMdl);
}
mProc.entry();
if (shadow != nullptr && sph != nullptr) {
diff --git a/src/toBeSorted/item_mdl_item.cpp b/src/toBeSorted/item_mdl_item.cpp
index eb2b2a0d..8cd8b825 100644
--- a/src/toBeSorted/item_mdl_item.cpp
+++ b/src/toBeSorted/item_mdl_item.cpp
@@ -459,9 +459,9 @@ void dItemMdlItem_c::setLocalMtx(const mMtx_c &mtx) {
void dItemMdlItem_c::draw() {
if (mDrawMode == DrawMode_Get) {
- mpItem->fn_8002ECD0(&mMdl, 6);
+ mpItem->drawModel(&mMdl, 6);
} else {
- mpItem->fn_8002ECD0(&mMdl, 7);
+ mpItem->drawModel(&mMdl, 7);
}
}
diff --git a/src/toBeSorted/item_mdl_light_fruit.cpp b/src/toBeSorted/item_mdl_light_fruit.cpp
index fe6b3c01..08fc78c9 100644
--- a/src/toBeSorted/item_mdl_light_fruit.cpp
+++ b/src/toBeSorted/item_mdl_light_fruit.cpp
@@ -5,7 +5,6 @@
#include "d/a/d_a_itembase.h"
#include "toBeSorted/arc_managers/oarc_manager.h"
-
bool dItemMdlLightFruit_c::isMdlForItemId(u16 itemId) {
return itemId == ITEM_LIGHT_FRUIT;
}
@@ -93,11 +92,11 @@ void dItemMdlLightFruit_c::draw() {
switch (mDrawMode) {
case DrawMode_Put:
mPutAnmTexSrt.play();
- mpItem->fn_8002ECD0(&mPutMdl, 7);
+ mpItem->drawModel(&mPutMdl, 7);
break;
case DrawMode_Get:
mGetAnmTexSrt.play();
- mpItem->fn_8002ECD0(&mGetMdl, 6);
+ mpItem->drawModel(&mGetMdl, 6);
break;
}
}
diff --git a/src/toBeSorted/item_mdl_misc.cpp b/src/toBeSorted/item_mdl_misc.cpp
index b9c345cd..bc052fec 100644
--- a/src/toBeSorted/item_mdl_misc.cpp
+++ b/src/toBeSorted/item_mdl_misc.cpp
@@ -284,8 +284,8 @@ void dItemMdlPut_c::setLocalMtx(const mMtx_c &mtx) {
void dItemMdlPut_c::draw() {
switch (mDrawMode) {
- case DrawMode_Put: mpItem->fn_8002ECD0(&mPutMdl, 7); break;
- case DrawMode_Get: mpItem->fn_8002ECD0(&mGetMdl, 6); break;
+ case DrawMode_Put: mpItem->drawModel(&mPutMdl, 7); break;
+ case DrawMode_Get: mpItem->drawModel(&mGetMdl, 6); break;
}
}
@@ -560,9 +560,9 @@ void dItemMdlShield_c::setLocalMtx(const mMtx_c &mtx) {
void dItemMdlShield_c::draw() {
if (mDrawMode == DrawMode_Get) {
- mpItem->fn_8002ECD0(&mMdl, 6);
+ mpItem->drawModel(&mMdl, 6);
} else {
- mpItem->fn_8002ECD0(&mMdl, 7);
+ mpItem->drawModel(&mMdl, 7);
}
}
@@ -828,9 +828,9 @@ void dItemMdlBottle_c::draw() {
}
if (mDrawMode == DrawMode_Get) {
- mpItem->fn_8002ECD0(&mMdl.getModel(), 6);
+ mpItem->drawModel(&mMdl.getModel(), 6);
} else {
- mpItem->fn_8002ECD0(&mMdl.getModel(), 7);
+ mpItem->drawModel(&mMdl.getModel(), 7);
}
}
@@ -967,11 +967,11 @@ void dItemMdlTear_c::draw() {
switch (mDrawMode) {
case DrawMode_Put:
mPutAnmTexSrt.play();
- mpItem->fn_8002ECD0(&mPutMdl, 7);
+ mpItem->drawModel(&mPutMdl, 7);
break;
case DrawMode_Get:
mGetAnmTexSrt.play();
- mpItem->fn_8002ECD0(&mGetMdl, 6);
+ mpItem->drawModel(&mGetMdl, 6);
break;
}
}
@@ -1038,8 +1038,8 @@ void dItemMdlFirefly_c::setLocalMtx(const mMtx_c &mtx) {
void dItemMdlFirefly_c::draw() {
switch (mDrawMode) {
- case DrawMode_Put: mpItem->fn_8002ECD0(&mMdl, 7); break;
- case DrawMode_Get: mpItem->fn_8002ECD0(&mMdl, 6); break;
+ case DrawMode_Put: mpItem->drawModel(&mMdl, 7); break;
+ case DrawMode_Get: mpItem->drawModel(&mMdl, 6); break;
}
mAnmMatClr.play();
}
@@ -1314,8 +1314,8 @@ void dItemMdlPotion_c::draw() {
mAnmChr.play();
mAnmTexSrt.play();
switch (mDrawMode) {
- case DrawMode_Put: mpItem->fn_8002ECD0(&mMdl, 7); break;
- case DrawMode_Get: mpItem->fn_8002ECD0(&mMdl, 6); break;
+ case DrawMode_Put: mpItem->drawModel(&mMdl, 7); break;
+ case DrawMode_Get: mpItem->drawModel(&mMdl, 6); break;
}
}
diff --git a/src/toBeSorted/item_mdl_rupee.cpp b/src/toBeSorted/item_mdl_rupee.cpp
index 0aec69f0..3611feb1 100644
--- a/src/toBeSorted/item_mdl_rupee.cpp
+++ b/src/toBeSorted/item_mdl_rupee.cpp
@@ -99,7 +99,6 @@ bool dItemMdlRupee_c::init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator)
mGetMdl.setAnm(mGetAnmTexPat);
mGetAnmTexPat.setFrame(sMdlConfig[i].texPatFrame, 0);
}
-
mpItem = item;
return true;
@@ -125,8 +124,8 @@ void dItemMdlRupee_c::setLocalMtx(const mMtx_c &mtx) {
void dItemMdlRupee_c::draw() {
switch (mDrawMode) {
- case DrawMode_Put: mpItem->fn_8002ECD0(&mPutMdl, 7); break;
- case DrawMode_Get: mpItem->fn_8002ECD0(&mGetMdl, 6); break;
+ case DrawMode_Put: mpItem->drawModel(&mPutMdl, 7); break;
+ case DrawMode_Get: mpItem->drawModel(&mGetMdl, 6); break;
}
}
diff --git a/src/toBeSorted/item_mdl_stamina_fruit.cpp b/src/toBeSorted/item_mdl_stamina_fruit.cpp
index cf1e0947..58b05e60 100644
--- a/src/toBeSorted/item_mdl_stamina_fruit.cpp
+++ b/src/toBeSorted/item_mdl_stamina_fruit.cpp
@@ -85,11 +85,11 @@ void dItemMdlStaminaFruit_c::draw() {
switch (mDrawMode) {
case DrawMode_Put:
mPutAnmTexSrt.play();
- mpItem->fn_8002ECD0(&mPutMdl, 7);
+ mpItem->drawModel(&mPutMdl, 7);
break;
case DrawMode_Get:
mGetAnmTexSrt.play();
- mpItem->fn_8002ECD0(&mGetMdl, 6);
+ mpItem->drawModel(&mGetMdl, 6);
break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-14 04:10:43 +0000