summaryrefslogtreecommitdiff
path: root/src/d/actor
diff options
context:
space:
mode:
Diffstat (limited to 'src/d/actor')
-rw-r--r--src/d/actor/d_a_demo00.cpp4
-rw-r--r--src/d/actor/d_a_player_fan.inc4
-rw-r--r--src/d/actor/d_a_pw.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp
index dbc9f712..40565136 100644
--- a/src/d/actor/d_a_demo00.cpp
+++ b/src/d/actor/d_a_demo00.cpp
@@ -69,8 +69,8 @@ void daDemo00_c::setBaseMtx() {
void daDemo00_c::setShadowSize() {
J3DModelData* modelData = model.model->getModelData();
- cXyz min(1000000000.0f, 1000000000.0f, 1000000000.0f);
- cXyz max(-1000000000.0f, -1000000000.0f, -1000000000.0f);
+ cXyz min(100000000.0f, 100000000.0f, 100000000.0f);
+ cXyz max(-100000000.0f, -100000000.0f, -100000000.0f);
for (u16 i = 0; i < modelData->getJointNum(); i++) {
J3DJoint* joint = modelData->getJointNodePointer(i);
diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc
index 524e8458..3019f9b0 100644
--- a/src/d/actor/d_a_player_fan.inc
+++ b/src/d/actor/d_a_player_fan.inc
@@ -35,7 +35,7 @@ BOOL daPy_lk_c::fanJointCB(int param_0) {
}
mDoMtx_stack_c::revConcat(mpEquipItemModel->getAnmMtx(param_0));
mpEquipItemModel->setAnmMtx(1 * param_0, mDoMtx_stack_c::get());
- mDoMtx_stack_c::copy(j3dSys.mCurrentMtx);
+ mDoMtx_copy(mDoMtx_stack_c::get(), j3dSys.mCurrentMtx);
return true;
}
@@ -62,7 +62,7 @@ BOOL daPy_lk_c::parachuteJointCB(int param_0) {
}
mDoMtx_stack_c::revConcat(mpEquipItemModel->getAnmMtx(param_0));
mpEquipItemModel->setAnmMtx(1 * param_0, mDoMtx_stack_c::get());
- mDoMtx_stack_c::copy(j3dSys.mCurrentMtx);
+ mDoMtx_copy(mDoMtx_stack_c::get(), j3dSys.mCurrentMtx);
return true;
}
diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp
index e6c738eb..b941743e 100644
--- a/src/d/actor/d_a_pw.cpp
+++ b/src/d/actor/d_a_pw.cpp
@@ -55,11 +55,11 @@ static BOOL daPW_Draw(pw_class*) {
void anm_init(pw_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f32 speed, int soundFileIdx) {
i_this->mBckIdx = bckFileIdx;
if (soundFileIdx >= 0) {
- void* soundAnm = dComIfG_getObjectRes("AM", soundFileIdx);
- J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx);
+ void* soundAnm = dComIfG_getObjectRes("PW", soundFileIdx);
+ J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("PW", bckFileIdx);
i_this->mpMorf->setAnm(bckAnm, loopMode, morf, speed, 0.0f, -1.0f, soundAnm);
} else {
- J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx);
+ J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("PW", bckFileIdx);
i_this->mpMorf->setAnm(bckAnm, loopMode, morf, speed, 0.0f, -1.0f, NULL);
}
}