mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 05:37:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Demo work, d_a_kytag02 and d_a_ff OK

Browse Source
This commit is contained in:
LagoLunatic
2025-05-31 20:09:14 -04:00
parent f71ec718fe
commit bd917524ba
24 changed files with 403 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_main.cpp
+4 -4
View File
@@ -6907,7 +6907,7 @@ BOOL daPy_lk_c::procFrontRollCrash_init() {
dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5);
if ((mAcch.ChkWallHit()) && (mAcchCir[0].ChkWallHit())) {
daObjMovebox::Act_c* iVar1 =
(daObjMovebox::Act_c*)dComIfG_Bgsp()->GetActorPointer(mAcchCir[0].GetBgIndex());
(daObjMovebox::Act_c*)dComIfG_Bgsp()->GetActorPointer(mAcchCir[0]);
if ((iVar1 != 0) && (fopAcM_GetName(iVar1) == PROC_Obj_Movebox) &&
((iVar1->mType == 0) || (iVar1->mType == 5)))
{
@@ -11167,7 +11167,7 @@ void daPy_lk_c::checkRoofRestart() {
{
if ((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_BOSS_e &&
((!dComIfG_Bgsp()->ChkMoveBG(mAcch.m_roof) ||
(fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_roof.GetBgIndex())) !=
(fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_roof)) !=
PROC_BRIDGE)))))
{
f32 dVar9 = mAcch.m_roof_y;
@@ -12460,14 +12460,14 @@ cPhs_State daPy_lk_c::makeBgWait() {
mAcch.CrrPos(*dComIfG_Bgsp());
if ((-G_CM3D_F_INF == mAcch.GetGroundH()) ||
(((m352E != 0 && (dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd))) &&
(fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd.GetBgIndex())) ==
(fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) ==
PROC_TBOX))))
{
return cPhs_INIT_e;
}
if (((fopAcM_GetParam(this) & 0x80) != 0) && (m352E != 0)) {
if (!(dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd)) ||
(fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd.GetBgIndex())) !=
(fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) !=
PROC_OBJ_IKADA))
{
return cPhs_INIT_e;