mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-08 04:07:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixup: dAcEKs_c::executeState_Wait thx robo

Browse Source
This commit is contained in:
elijah-thomas774
2026-05-24 15:50:34 -04:00
parent 85df7c194d
commit 8b86a0ce51
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/REL/d/a/e/d_a_e_ks.cpp
+5 -8
View File
@@ -1811,7 +1811,6 @@ void dAcEKs_c::executeState_Wait() {
if (flag < 0xFF) {
if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, flag)) {
if (field_0xDCE == 0) {
bool b = false;
mStartingState = EKS_STARTSTATE_Move;
if (field_0xDA6 == 0) {
mMtx_c m;
@@ -1819,13 +1818,11 @@ void dAcEKs_c::executeState_Wait() {
mVec3_c out, in(0, 0, 500);
m.multVecSR(in, out);
mVec3_c start(getStartingPos() + out);
mVec3_c out2 = out * 2.f;
mVec3_c end(getStartingPos() + out2);
if (dBgS_ObjLinChk::LineCross(&start, &end, nullptr) && dBgS_ObjLinChk::ChkWall()) {
b = true;
}
if (!b) {
// TODO Fixup LineCross for Const References
if (!(dBgS_ObjLinChk::LineCross(
&(getStartingPos() + out), &(getStartingPos() + out * 2.0f), nullptr
) &&
dBgS_ObjLinChk::ChkWall())) {
out *= 2.f;
}
setStartingPosition(getStartingPos() + out);