mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-05 12:53:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some regressions

Browse Source
This commit is contained in:
LagoLunatic
2024-04-16 20:48:05 -04:00
parent 9d746447f9
commit e1f3d5ce93
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_item.cpp
+3 -3
View File
@@ -1235,13 +1235,13 @@ void daItem_c::mode_water_init() {
clrFlag(FLAG_UNK04);
scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
cXyz scale;
cXyz particleScale;
f32 temp = dItem_data::getShadowSize(m_itemNo);
f32 temp3 = temp / dItem_data::getShadowSize(dItem_GREEN_RUPEE_e);
temp3 *= scale.x;
scale.setall(temp3);
particleScale.setall(temp3);
dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &scale, 0xFF, &mPtclRippleCb);
dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb);
mPtclRippleCb.mRate = 0.0f;
}
src/d/actor/d_a_rd.cpp
+7 -7
View File
@@ -179,15 +179,15 @@ BOOL daRd_c::_nodeControl(J3DNode* node, J3DModel* model) {
static cXyz l_offsetAttPos(0.0f, 0.0f, 0.0f);
static cXyz l_offsetEyePos(24.0f, -16.0f, 0.0f);
mDoMtx_stack_c::multVec(&l_offsetAttPos, &mTargetPos);
mDoMtx_stack_c::XrotM(mJntCtrl.getHead_y());
mDoMtx_stack_c::ZrotM(mJntCtrl.getHead_x());
mDoMtx_stack_c::XrotM((int)mJntCtrl.getHead_y());
mDoMtx_stack_c::ZrotM((int)mJntCtrl.getHead_x());
mDoMtx_stack_c::multVec(&l_offsetEyePos, &mRdEyePos);
mDoMtx_stack_c::XrotM(mD1A);
mDoMtx_stack_c::ZrotM(mD1C);
mDoMtx_stack_c::YrotM(mD1E);
} else if (mJntCtrl.getBackboneJntNum() == jntNo) {
mDoMtx_stack_c::XrotM(mJntCtrl.getBackbone_y());
mDoMtx_stack_c::ZrotM(mJntCtrl.getBackbone_x());
mDoMtx_stack_c::XrotM((int)mJntCtrl.getBackbone_y());
mDoMtx_stack_c::ZrotM((int)mJntCtrl.getBackbone_x());
}
cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
@@ -732,11 +732,11 @@ void daRd_c::setIceCollision() {
/* 0000180C-00001970 .text setAttention__6daRd_cFv */
void daRd_c::setAttention() {
cXyz attnPos(60.0f, 0.0f, 0.0f);
cXyz eyePos(60.0f, 0.0f, 0.0f);
cXyz eyeballPos(60.0f, 0.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x0C)); // ree_atama_1 joint
mDoMtx_stack_c::multVec(&attnPos, &attention_info.position);
mDoMtx_stack_c::multVecZero(&eyePos);
eyePos = eyePos;
mDoMtx_stack_c::multVecZero(&eyeballPos);
eyePos = eyeballPos;
attention_info.position.y += l_HIO.m58;
eyePos.y += l_HIO.m5C;