mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-05 17:10:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove fake matches, fix false equivalencies, and other small matches (#2837)

Browse Source 
* Debug matches and remove fake matches

* Fix false equivalencies, regallocs, and vtable orders

* Fix PAL splits
This commit is contained in:
LagoLunatic
2025-11-21 00:17:51 -05:00
committed by GitHub
parent 6f7457a870
commit 91011befd7
41 changed files with 217 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_Lv5Key.cpp
+8 -7
View File
@@ -39,7 +39,7 @@ int daObjLv5Key_c::Init() {
setStatus(STATUS_WAIT);
mAction = NULL;
setAction(&Wait, 1);
setAction(&daObjLv5Key_c::Wait, 1);
return cPhs_COMPLEATE_e;
}
@@ -137,9 +137,9 @@ void daObjLv5Key_c::Wait(int param_0) {
case 1:
if (is_open_start()) {
setBgc();
setAction(&Open, 1);
setAction(&daObjLv5Key_c::Open, 1);
} else if (is_shake_start()) {
setAction(&Shake, 1);
setAction(&daObjLv5Key_c::Shake, 1);
}
}
}
@@ -158,7 +158,7 @@ void daObjLv5Key_c::Open(int param_0) {
mBck.play();
if (mBck.isStop()) {
setAction(&Fall, 1);
setAction(&daObjLv5Key_c::Fall, 1);
}
}
}
@@ -174,7 +174,7 @@ void daObjLv5Key_c::Fall(int param_0) {
fopAcM_SetGravity(this, -6.0f);
mMode = 1;
break;
case 1:
case 1: {
fopAcM_calcSpeed(this);
fopAcM_posMove(this, NULL);
@@ -194,6 +194,7 @@ void daObjLv5Key_c::Fall(int param_0) {
mMode = 2;
}
break;
}
case 2:
RotateAngle();
@@ -207,7 +208,7 @@ void daObjLv5Key_c::Fall(int param_0) {
current.pos.y = prev_y;
if (mAcch.ChkGroundHit()) {
setAction(&Land, 1);
setAction(&daObjLv5Key_c::Land, 1);
}
}
}
@@ -267,7 +268,7 @@ void daObjLv5Key_c::Shake(int param_0) {
decShakeNum();
if (is_shake_end()) {
setAction(&Wait, 1);
setAction(&daObjLv5Key_c::Wait, 1);
}
}
}