mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-21 16:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_zm matching (#2638)

Browse Source 
* initial work

* a little more work

* matching

* pr cleanup

* changed 'subtype' to 'argument'

* fixed debug error
This commit is contained in:
Carco_21
2025-09-09 15:53:13 -07:00
committed by GitHub
parent 1e50c25671
commit bfeb1c048b
24 changed files with 1124 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_b_dr.cpp
+2 -2
View File
@@ -3927,7 +3927,7 @@ int daB_DR_c::execute() {
if (arg0 == 0xFF) {
if (parentActorID != 0 && health > 1 && cLib_calcTimer<int>(&mTimer[0]) == 0) {
fopAc_ac_c* parent;
if (fopAcM_SearchByID(parentActorID, &parent) != 0 && parent != NULL && parent->subtype != 1) {
if (fopAcM_SearchByID(parentActorID, &parent) != 0 && parent != NULL && parent->argument != 1) {
if (dComIfGs_isZoneSwitch(20, fopAcM_GetRoomNo(this))) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
}
@@ -3965,7 +3965,7 @@ int daB_DR_c::execute() {
current.angle = parent->current.angle;
shape_angle = parent->shape_angle;
if (parent->subtype == 1 && field_0x7e0 < 54) {
if (parent->argument == 1 && field_0x7e0 < 54) {
if (mAnm != ANM_DR_BURU) {
setBck(ANM_DR_BURU, 0, 0.0f, 1.0f);
mpModelMorf->setStartFrame(111.0f);