mirror of
https://github.com/zeldaret/ss
synced 2026-08-04 01:03:19 -04:00
position -> mPosition
This commit is contained in:
@@ -419,7 +419,7 @@ void AttentionGroup::fn_800964B0() {
|
||||
extern "C" f32 lbl_8057CD9C;
|
||||
|
||||
f32 AttentionManager::targetScore(dAcObjBase_c *target, dAcObjBase_c *origin) {
|
||||
s16 angle = cLib::targetAngleY(target->position, origin->position) - origin->mRotation.y.mVal;
|
||||
s16 angle = cLib::targetAngleY(target->mPosition, origin->mPosition) - origin->mRotation.y.mVal;
|
||||
f32 viewAngle = fabsf(angle * lbl_8057CD9C);
|
||||
if (viewAngle > 0.5f) {
|
||||
return viewAngle;
|
||||
|
||||
@@ -1250,7 +1250,7 @@ void dWaterEffect_c::execute(f32 water, f32 ground) {
|
||||
if (b) {
|
||||
if (!mIsInWater) {
|
||||
mIsInWater = true;
|
||||
mVec3_c pos(ac->position.x, water, ac->position.z);
|
||||
mVec3_c pos(ac->mPosition.x, water, ac->mPosition.z);
|
||||
mVec3_c scale(mScale, mScale, mScale);
|
||||
if (mIsSmall || water - ground < 50.0f) {
|
||||
// For small objects or shallow water, create a
|
||||
@@ -1270,7 +1270,7 @@ void dWaterEffect_c::execute(f32 water, f32 ground) {
|
||||
|
||||
if (mIsInWater && getActorCeilPos(ac) > water) {
|
||||
// Spawn effect while in water
|
||||
mVec3_c pos(ac->position.x, water, ac->position.z);
|
||||
mVec3_c pos(ac->mPosition.x, water, ac->mPosition.z);
|
||||
mVec3_c scale(mScale, mScale, mScale);
|
||||
mEff.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_127_, pos, nullptr, &scale, nullptr, nullptr);
|
||||
f32 rate = nw4r::math::FAbs(ac->forwardSpeed) * 0.02f;
|
||||
|
||||
@@ -50,7 +50,7 @@ void DowsingTarget::reinitialize(DowsingSlot type) {
|
||||
void DowsingTarget::getPosition(mVec3_c &position) {
|
||||
mMtx_c mtx;
|
||||
mMtx_c mtx2;
|
||||
PSMTXTrans(mtx.m, mpActor->position.x, mpActor->position.y, mpActor->position.z);
|
||||
PSMTXTrans(mtx.m, mpActor->mPosition.x, mpActor->mPosition.y, mpActor->mPosition.z);
|
||||
mtx.YrotM(mpActor->mRotation.y);
|
||||
PSMTXScale(mtx2.m, mpActor->mScale.x, mpActor->mScale.y, mpActor->mScale.z);
|
||||
PSMTXConcat(mtx.m, mtx2.m, mtx.m);
|
||||
|
||||
@@ -26,6 +26,6 @@ bool SoundInfo::initSource(s32 sourceType, const char *name, const mVec3_c *posP
|
||||
bool SoundInfo::startBgHitSound(u32 soundId, const cBgS_PolyInfo &info, const mVec3_c *position) {
|
||||
return mpSource->startBgHitSound(
|
||||
soundId, dBgS::GetInstance()->GetPolyAtt0(info), dBgS::GetInstance()->GetPolyAtt1(info),
|
||||
position != nullptr ? position : &mpActor->position
|
||||
position != nullptr ? position : &mpActor->mPosition
|
||||
);
|
||||
}
|
||||
|
||||
@@ -509,7 +509,7 @@ bool SpecialItemDropMgr::spawnSpecialDropItem(int specialItemId, int roomid, mVe
|
||||
max = rot;
|
||||
min = SOME_ANG;
|
||||
} else {
|
||||
max = (s16)cLib::targetAngleY(dAcPy_c::LINK->position, *pos) + 0x4000;
|
||||
max = (s16)cLib::targetAngleY(dAcPy_c::LINK->mPosition, *pos) + 0x4000;
|
||||
min = -0x8000;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user