mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-10-10 05:51:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use SQUARE macro for more literals

Browse Source
This commit is contained in:
LagoLunatic
2026-09-23 16:04:02 -04:00
parent 4c0b75df41
commit 72d0923cfe
18 changed files with 53 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_ba1.cpp
+3 -3
View File
@@ -864,7 +864,7 @@ void daNpc_Ba1_c::partner_srch() {
/* 00001B90-00001CA8 .text check_useFairyArea__11daNpc_Ba1_cFv */
bool daNpc_Ba1_c::check_useFairyArea() {
bool ret;
f32 mag = std::sqrtf((dComIfGp_getPlayer(0)->current.pos - current.pos).abs2XZ());
f32 mag = (dComIfGp_getPlayer(0)->current.pos - current.pos).absXZ();
ret = FALSE;
if (
std::abs(dComIfGp_getPlayer(0)->current.pos.y - current.pos.y) < 100.0f
@@ -1107,7 +1107,7 @@ bool daNpc_Ba1_c::eMove_MOV_POS_() {
return FALSE;
}
f32 mag = std::sqrtf((temp - current.pos).abs2XZ());
f32 mag = (temp - current.pos).absXZ();
ret = mag < 4.0f;
m78A.y = cLib_targetAngleY(&current.pos, &dComIfGp_getPlayer(0)->current.pos);
m7F5 = true;
@@ -1408,7 +1408,7 @@ BOOL daNpc_Ba1_c::wait_0() {
}
m812 = 0;
if(!dComIfGs_isTmpBit(dSv_event_flag_c::UNK_0310)) {
f32 dist = std::sqrtf((dComIfGp_getPlayer(0)->current.pos - current.pos).abs2XZ());
f32 dist = (dComIfGp_getPlayer(0)->current.pos - current.pos).absXZ();
if(
std::fabsf(dComIfGp_getPlayer(0)->current.pos.y - current.pos.y) < 100.0f
&& dist < l_HIO.mPrmTbl.m20
src/d/actor/d_a_npc_md.cpp
+1 -3
View File
@@ -1389,7 +1389,7 @@ void daNpc_Md_c::NpcCall(int* r31) {
}
} else {
f32 temp = 2.0f * l_HIO.m0C4;
if (dist_sq >= temp * temp) {
if (dist_sq >= SQUARE(temp)) {
setNpcAction(&daNpc_Md_c::searchNpcAction);
}
*r31 = 1;
@@ -2271,8 +2271,6 @@ s16 daNpc_Md_c::windProc() {
}
}
cStack_64.set(local_34.x, 0.0f, local_34.z);
//f32 cos = cM_scos(shape_angle.y);
//f32 sin = cM_ssin(shape_angle.y);
cStack_70.set(cM_ssin(shape_angle.y), 0.0f, cM_scos(shape_angle.y));
dVar6 = l_HIO.m134;
if (!(std::fabsf(cStack_64.abs2XZ()) < G_CM3D_F_ABS_MIN)) {
src/d/actor/d_a_npc_mk.cpp
+4 -4
View File
@@ -498,7 +498,7 @@ u8 daNpc_Mk_c::nextVisitMode() {
return VISIT_RUN_LINK;
case VISIT_WALK_PATH:
dist = pLink->current.pos - current.pos;
if(dist.abs2XZ() < 160000.0f && field_0x698.chkInside(&pLink->current.pos)) {
if(dist.abs2XZ() < SQUARE(400.0f) && field_0x698.chkInside(&pLink->current.pos)) {
return VISIT_NOTICE_LINK;
}
return VISIT_WALK_PATH;
@@ -509,7 +509,7 @@ u8 daNpc_Mk_c::nextVisitMode() {
}
dist = pLink->current.pos - current.pos;
if (dist.abs2XZ() < 22500.0f) {
if (dist.abs2XZ() < SQUARE(150.0f)) {
return VISIT_REACHED_LINK;
}
return VISIT_RUN_LINK;
@@ -521,7 +521,7 @@ u8 daNpc_Mk_c::nextVisitMode() {
}
dist = pLink->current.pos - current.pos;
if (dist.abs2XZ() > 32400.0f) {
if (dist.abs2XZ() > SQUARE(180.0f)) {
return VISIT_RUN_LINK;
}
@@ -542,7 +542,7 @@ u8 daNpc_Mk_c::nextVisitMode() {
}
dist = pLink->current.pos - current.pos;
if (dist.abs2XZ() < 160000.0f && field_0x698.chkInside(&pLink->current.pos)) {
if (dist.abs2XZ() < SQUARE(400.0f) && field_0x698.chkInside(&pLink->current.pos)) {
return VISIT_RUN_LINK;
}
return VISIT_WALK_PATH;
src/d/actor/d_a_npc_rsh1.cpp
+2 -2
View File
@@ -1176,10 +1176,10 @@ int daNpc_Rsh1_c::getAimShopPosIdx() {
for (int i = 0; i <= condition; i++) {
cXyz temp = link_pos;
temp -= mPathPointPos[i];
f32 mag = std::sqrtf(temp.abs2XZ());
f32 mag = temp.absXZ();
if (mag < fcond) {
fcond = std::sqrtf(temp.abs2XZ());
fcond = temp.absXZ();
result_index = i;
}
}
src/d/actor/d_a_npc_zl1.cpp
+8 -11
View File
@@ -1929,12 +1929,12 @@ void daNpc_Zl1_c::setStt(s8 param_1) {
/* 00003B8C-00003D14 .text chk_areaIN__11daNpc_Zl1_cFffs4cXyz */
bool daNpc_Zl1_c::chk_areaIN(f32 param_1, f32 param_2, s16 param_3, cXyz param_4) {
f32 abs1 = (dComIfGp_getPlayer(0)->current.pos - param_4).absXZ();
f32 abs2 = dComIfGp_getPlayer(0)->current.pos.y - param_4.y;
f32 distXZ = (dComIfGp_getPlayer(0)->current.pos - param_4).absXZ();
f32 distY = dComIfGp_getPlayer(0)->current.pos.y - param_4.y;
s16 angleY = cLib_targetAngleY(&current.pos, &dComIfGp_getPlayer(0)->current.pos);
s16 angle = (angleY - current.angle.y);
if(abs1 < param_1 && std::fabsf(abs2) < param_2 && abs(angle) < param_3) {
if(distXZ < param_1 && std::fabsf(distY) < param_2 && abs(angle) < param_3) {
return true;
}
return false;
@@ -2268,7 +2268,7 @@ BOOL daNpc_Zl1_c::demo_4() {
/* 00005718-00005954 .text optn_1__11daNpc_Zl1_cFv */
BOOL daNpc_Zl1_c::optn_1() {
f32 temp = l_HIO.mPrmTbl.field_34 + 100.0f;
f32 actorDist = fopAcM_searchPlayerDistance2(this);
f32 actorDistSq = fopAcM_searchPlayerDistance2(this);
if(field_0x7D7) {
if(chk_talk()) {
setStt(2);
@@ -2282,12 +2282,12 @@ BOOL daNpc_Zl1_c::optn_1() {
field_0x84A = 0;
field_0x7D8 = true;
if(actorDist >= temp*temp) {
if(actorDistSq >= SQUARE(temp)) {
s16 angle = fopAcM_searchPlayerAngleY(this);
cLib_addCalcAngleS(&current.angle.y, angle, 4, 0x800, 0x80);
if(abs((s16)(angle - current.angle.y)) < 0x1800) {
setStt(4);
if(actorDist > (l_HIO.mPrmTbl.field_4C * l_HIO.mPrmTbl.field_4C)) {
if(actorDistSq > SQUARE(l_HIO.mPrmTbl.field_4C)) {
field_0x7AE = l_HIO.mPrmTbl.field_32;
field_0x7B0 = l_HIO.mPrmTbl.field_2E;
} else {
@@ -2325,20 +2325,17 @@ BOOL daNpc_Zl1_c::optn_1() {
/* 00005954-00005C68 .text optn_2__11daNpc_Zl1_cFv */
BOOL daNpc_Zl1_c::optn_2() {
if(field_0x7CC) {
field_0x7CC = move_jmp(); // maybe rename field to something mIsMoveJumped
return TRUE;
}
f32 actorDist = fopAcM_searchPlayerDistance2(this);
f32 temp = actorDist - (l_HIO.mPrmTbl.field_34 * l_HIO.mPrmTbl.field_34);
f32 temp = actorDist - SQUARE(l_HIO.mPrmTbl.field_34);
f32 temp2 = 0.0f;
if(temp > 0.0f) {
temp2 = temp;
temp2 = std::sqrtf(temp2);
temp2 = std::sqrtf(temp);
temp2 = l_HIO.mPrmTbl.field_38 * temp2;
temp2 = cLib_maxLimit(temp2, l_HIO.mPrmTbl.field_3C);
}
src/d/actor/d_a_obj_auzu.cpp
-2
View File
@@ -155,11 +155,9 @@ void daObjAuzu::Act_c::ship_whirl() {
f32 sqr_mag_xz = fopAcM_searchActorDistanceXZ2(this, ship_p);
#if VERSION > VERSION_DEMO
f32 inner_activation = SQUARE(daObjAuzu::L_radius * attr().mInnerActivationMult);
f32 outer_activation = SQUARE(daObjAuzu::L_radius * attr().mOuterActivationMult);
#else
f32 outer_activation = SQUARE(daObjAuzu::L_radius * attr().mOuterActivationMult);
f32 inner_activation = SQUARE(daObjAuzu::L_radius * attr().mInnerActivationMult);
#endif
if (sqr_mag_xz < outer_activation) {
src/d/actor/d_a_obj_barrel.cpp
+3 -3
View File
@@ -339,7 +339,7 @@ void daObjBarrel::Act_c::mode_walk() {
set_walk_rot();
cLib_onBit<u32>(attention_info.flags, fopAc_Attn_ACTION_CARRY_e);
float mag = speed.abs2XZ();
f32 mag = speed.abs2XZ();
if (mag < l_gnd_fric) {
if (std::fabsf(norm->x) >= 0.001f && std::fabsf(norm->z) >= 0.001f) {
mode_wait_init();
@@ -572,8 +572,8 @@ bool daObjBarrel::Act_c::damage_cc_proc() {
broken = true;
} else if ((mMode == MODE_WAIT || mMode == MODE_WALK) && hitObj->ChkAtType(AT_TYPE_WIND)) {
cXyz windVec = *mCyl.GetTgRVecP();
float windMag2 = windVec.abs2();
if (windMag2 > l_wind_max*l_wind_max) {
f32 windMag2 = windVec.abs2();
if (windMag2 > SQUARE(l_wind_max)) {
windVec *= l_wind_max / std::sqrtf(windMag2);
}
cCcD_ShapeAttr* hitShapeAttr = hitObj->GetShapeAttr();
src/d/actor/d_a_obj_barrel2.cpp
+4 -4
View File
@@ -279,7 +279,7 @@ cPhs_State daObjBarrel2::Act_c::_create() {
&sp24,
prm_get_coming() ? 1 : 0
);
m45C = 3.4028235e+38f;
m45C = FLOAT_MAX;
m468 = 0;
m470 = 0;
m460 = fpcM_ERROR_PROCESS_ID_e;
@@ -763,7 +763,7 @@ void daObjBarrel2::Act_c::set_item_position() {
raceItem->startOffsetPos();
m45C = fopAcM_searchPlayerDistance2(raceItem);
} else {
m45C = 3.4028235e+38f;
m45C = FLOAT_MAX;
}
}
@@ -777,7 +777,7 @@ void daObjBarrel2::Act_c::item_drop_init(float arg1) {
raceItem->endOffsetPos(-7.0f, &sp08, arg1, 0.0f, (csXyz*)&csXyz::Zero);
m45C = fopAcM_searchPlayerDistance2(raceItem);
} else {
m45C = 3.4028235e+38f;
m45C = FLOAT_MAX;
}
}
@@ -786,7 +786,7 @@ void daObjBarrel2::Act_c::item_drop() {
if (M_tmp_item_actor != NULL) {
m45C = fopAcM_searchPlayerDistance2(M_tmp_item_actor);
} else {
m45C = 3.4028235e+38f;
m45C = FLOAT_MAX;
}
}
src/d/actor/d_a_player_crawl.inc
+4 -6
View File
@@ -184,18 +184,16 @@ int daPy_lk_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
/* 80138F28-801390B8 .text crawlBgCheck__9daPy_lk_cFP4cXyzP4cXyz */
void daPy_lk_c::crawlBgCheck(cXyz* param_0, cXyz* param_1) {
int iVar1;
int iVar2;
cXyz cStack_50;
cXyz cStack_44;
cXyz cStack_38;
mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_top_offset, &cStack_50);
iVar1 = getCrawlMoveVec(&cStack_50, param_0, &cStack_44);
int iVar1 = getCrawlMoveVec(&cStack_50, param_0, &cStack_44);
mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_top_up_offset, &cStack_50);
iVar2 = getCrawlMoveVec(&cStack_50, param_1, &cStack_38);
int iVar2 = getCrawlMoveVec(&cStack_50, param_1, &cStack_38);
if (iVar1 != 0 && iVar2 != 0) {
if (cStack_44.abs2() > cStack_38.abs()) {
if (cStack_44.abs2() > cStack_38.abs()) { // abs2 to abs comparison? bug?
current.pos -= cStack_44;
} else {
current.pos -= cStack_38;
@@ -225,7 +223,7 @@ BOOL daPy_lk_c::checkCrawlSideWall(cXyz* param_1, cXyz* param_2, cXyz* param_3,
*param_6 = cM_atan2s(plane->GetNP()->x, plane->GetNP()->z);
cXyz local_9c = *param_3 - *param_4;
f32 temp_f31 = local_9c.abs2XZ();
if (cLib_distanceAngleS(*param_5, *param_6) > 0x7F00 && temp_f31 < 5625.0f && temp_f31 > 3600.0f) {
if (cLib_distanceAngleS(*param_5, *param_6) > 0x7F00 && temp_f31 < SQUARE(75.0f) && temp_f31 > SQUARE(60.0f)) {
return true;
}
}
src/d/actor/d_a_player_main.cpp
+9 -12
View File
@@ -3061,7 +3061,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
bVar3 = false;
}
if (mStickDistance < 0.05f &&
((f1_2 >= 25.0f || ((f1_2 >= 0.09f && ((m34C3 == 9 || m34C3 == 10)))))))
((f1_2 >= SQUARE(5.0f) || ((f1_2 >= SQUARE(0.3f) && ((m34C3 == 9 || m34C3 == 10)))))))
{
seStartMapInfo(JA_SE_LK_SLIP_SUS);
if ((m34C3 != 9 && (bVar3)) || ((m34C3 != 10 && (!bVar3)))) {
@@ -3179,7 +3179,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
m3598 = (f28 * (1.0f - f1));
} else {
f32 f1;
if (f31 >= 169.0f) {
if (f31 >= SQUARE(13.0f)) {
f1 = 1.7f * m_HIO->mMove.m.field_0x48;
onResetFlg0(daPyRFlg0_UNK40000);
} else {
@@ -4511,21 +4511,18 @@ BOOL daPy_lk_c::checkNextMode(int r29) {
/* 8010EC78-8010ED68 .text checkIceSlipFall__9daPy_lk_cFv */
BOOL daPy_lk_c::checkIceSlipFall() {
s16 sVar3 = cM_atan2s(m36A0.x, m36A0.z);
f32 fVar1;
f32 fVar2;
s16 sVar3 = cM_atan2s(m36A0.x, m36A0.z);
if (m34C3 == 1) {
fVar1 = 15.0f;
fVar2 = 169.0f;
fVar2 = SQUARE(13.0f);
} else {
fVar1 = 10.0f;
fVar2 = 49.0f;
fVar2 = SQUARE(7.0f);
}
f32 dVar5 = fVar2;
f32 dVar6 = fVar1;
if (cLib_distanceAngleS(sVar3, current.angle.y) > 0x7000 && mNormalSpeed >= dVar6 &&
m36A0.abs2XZ() >= dVar5)
if (cLib_distanceAngleS(sVar3, current.angle.y) > 0x7000 && mNormalSpeed >= fVar1 &&
m36A0.abs2XZ() >= fVar2)
{
mProcVar0.m34D0--;
if (mProcVar0.m34D0 == 0) {
@@ -10487,10 +10484,10 @@ void daPy_lk_c::setDemoData() {
demo_mode = daPy_demo_c::DEMO_N_WALK_e;
}
f32 dVar22 = sp44.abs2XZ();
if (dVar22 < 100.0f || (dVar22 < 2500.0f && std::abs(mNormalSpeed) < 0.001f)) {
if (dVar22 < SQUARE(10.0f) || (dVar22 < SQUARE(50.0f) && std::abs(mNormalSpeed) < 0.001f)) {
demo_mode = daPy_demo_c::DEMO_N_WAIT_e;
mNormalSpeed = 0.0f;
} else if ((demo_mode == daPy_demo_c::DEMO_N_WALK_e && dVar22 < 400.0f) || dVar22 < 2500.0f) {
} else if ((demo_mode == daPy_demo_c::DEMO_N_WALK_e && dVar22 < SQUARE(20.0f)) || dVar22 < SQUARE(50.0f)) {
mDemo.setStick(0.0f);
}
mDemo.setMoveAngle(cM_atan2s(sp44.x, sp44.z));
src/d/actor/d_a_ship.cpp
+1 -2
View File
@@ -3214,8 +3214,7 @@ void daShip_c::setRopePos() {
spEC.set(*currentRopeSegment - *(currentRopeSegment + 1));
f32 fVar17 = std::sqrtf(spEC.abs2());
f32 fVar17 = spEC.abs();
if (fVar17 < 0.01f) {
currentRopeSegment->set(*(currentRopeSegment + 1) + l_rope_base_vec);
}
src/d/actor/d_a_tag_mk.cpp
+2 -2
View File
@@ -27,7 +27,7 @@ u8 daTag_Mk_c::getType() {
}
/* 0000009C-000001F8 .text checkArea__10daTag_Mk_cFfff */
BOOL daTag_Mk_c::checkArea(float arg1, float arg2, float arg3) {
BOOL daTag_Mk_c::checkArea(f32 arg1, f32 arg2, f32 arg3) {
fopAc_ac_c* player = dComIfGp_getLinkPlayer();
cXyz local_54 = player->current.pos - current.pos;
@@ -326,7 +326,7 @@ BOOL daTag_Mk_c::actionVilla() {
if (eventInfo.checkCommandTalk()) {
setAction(ACT_VILLATALK_e);
talkInit();
} else if (checkArea(6400.0f, 12100.0f, 62500.0f)) {
} else if (checkArea(SQUARE(80.0f), SQUARE(110.0f), SQUARE(250.0f))) {
eventInfo.onCondition(dEvtCnd_CANTALK_e);
eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
}
src/d/actor/d_a_tsubo.cpp
+5 -5
View File
@@ -2281,15 +2281,15 @@ bool Act_c::damage_tg_acc() {
}
if (fVar1 > 0.0f) {
f32 abs = m814.abs();
f32 temp1 = m814.abs();
cXyz sp34 = *mCyl.GetTgRVecP();
f32 abs2 = sp34.abs();
f32 temp2 = sp34.abs();
if (fVar1 > abs && abs2 > abs) {
if (abs2 < fVar1) {
if (fVar1 > temp1 && temp2 > temp1) {
if (temp2 < fVar1) {
m814 = sp34;
} else {
m814 = sp34 * (fVar1 / abs2);
m814 = sp34 * (fVar1 / temp2);
}
m814.y += fVar2;
iVar9 = true;
src/d/d_drawlist.cpp
+2 -3
View File
@@ -1304,13 +1304,12 @@ u8 setShadowRealMtx(Mtx viewMtx, Mtx renderProjMtx, Mtx receiverProjMtx, cXyz* l
lightVec.z *= tmp;
}
f32 lightDist = std::sqrtf(lightVec.abs2());
f32 lightDist = lightVec.abs();
if (lightDist != 0.0f) {
f32 tmp3 = (lightVec.y / lightDist);
if (tmp3 < 1.5f) {
lightVec.y = 1.5f * lightDist;
lightDist = lightVec.abs2();
lightDist = std::sqrtf(lightDist);
lightDist = lightVec.abs();
}
lightDist = (casterSize * 0.5f) / lightDist;
}
src/d/d_flower.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void dFlower_data_c::WorkCo(fopAc_ac_c* param_1, u32 param_2, int param_3) {
temp1.z = field_0x04.z - param_1->current.pos.z;
f32 val = temp1.abs2XZ();
if(val > 900.0f) {
if(val > SQUARE(30.0f)) {
return;
}
src/d/d_grass.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ void dGrass_data_c::WorkCo(fopAc_ac_c* other, u32, int roomNo) {
delta.z = mPos.z - other->current.pos.z;
f32 distSq = delta.abs2XZ();
if (distSq > 1600.0f)
if (distSq > SQUARE(40.0f))
return;
delta.y = mPos.y - other->current.pos.y;
src/d/d_jnt_hit.cpp
+2 -2
View File
@@ -96,7 +96,7 @@ BOOL JntHit_c::CylHitPosAngleOffset(cXyz* r27, csXyz* r28, cXyz* r29, csXyz* r30
r1_B8 -= r1_D0;
if (r1_B8.normalizeRS()) {
f32 f31 = r1_DC.inprod(r1_B8);
f32 temp = f31*f31 + f28*f28 - r1_DC.abs2();
f32 temp = SQUARE(f31) + SQUARE(f28) - r1_DC.abs2();
if (temp < 0.0f)
temp = 0.0f;
f32 temp2 = (-f31 - std::sqrtf(temp));
@@ -195,7 +195,7 @@ BOOL JntHit_c::SphHitPosAngleOffset(cXyz* r27, csXyz* r29, cXyz* r30, csXyz* r31
f32 cosY = cM_scos(r29->y);
cXyz r1_34(cosX * sinY, -sinX, cosX * cosY);
f32 f31 = r27->inprod(r1_34);
f32 temp = f31*f31 + f30*f30 - r27->abs2();
f32 temp = SQUARE(f31) + SQUARE(f30) - r27->abs2();
if (temp < 0.0f)
temp = 0.0f;
f32 temp2 = (-f31 - std::sqrtf(temp));
src/d/d_npc_event_cut.inc
+1 -1
View File
@@ -543,7 +543,7 @@ void dNpc_EventCut_c::cutMoveToPosProc() {
dComIfGp_evmng_cutEnd(mEvtStaffId);
}
f32 dist = std::sqrtf((temp - mpActor->current.pos).abs2XZ());
f32 dist = (temp - mpActor->current.pos).absXZ();
cLib_addCalc2(&mpActor->current.pos.x, temp.x, 0.1f, mSpeed);
cLib_addCalc2(&mpActor->current.pos.z, temp.z, 0.1f, mSpeed);