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

More miscellaneous TU improvements (#2665)

Browse Source
This commit is contained in:
Max Roncace
2025-09-17 08:01:59 -04:00
committed by GitHub
parent 2106c56f60
commit fe5e8aff98
33 changed files with 659 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_pz.cpp
+26 -21
View File
@@ -199,8 +199,8 @@ static u8 l_initHIO;
static daE_PZ_HIO_c l_HIO;
/* 80761E29 0003+00 data_80761E29 None */
static u8 data_80761E28;
static u8 data_80761E29;
static u8 lbl_222_bss_70;
static u8 lbl_222_bss_71;
/* 80758A94-80758BA0 000614 010C+00 3/3 0/0 0/0 .text mPzScaleSet__8daE_PZ_cFb */
bool daE_PZ_c::mPzScaleSet(bool param_0) {
@@ -481,6 +481,7 @@ void daE_PZ_c::executeOpeningDemo() {
cXyz sp108;
cXyz spFC;
f32 var_f31 = 0.0f;
fopAc_ac_c* parent;
int sp28 = 22;
@@ -645,11 +646,11 @@ void daE_PZ_c::executeOpeningDemo() {
if (mAnm != 0xD) {
setBck(0xD, 2, 3.0f, 1.0f);
parentActorID = fopAcM_createChild(PROC_E_PZ, fopAcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
// fakematch, fpcM_GetID should be fopAcM_GetID
parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
}
field_0x7d8 = 0;
data_80761E29 = 0;
lbl_222_bss_71 = field_0x7d8 = 0;
if (field_0x7d0 == 0) {
field_0x7d0 = 120;
@@ -743,9 +744,8 @@ void daE_PZ_c::executeOpeningDemo() {
}
break;
case 130:
field_0x7d8 = 2;
data_80761E29 = 2;
data_80761E28 = 0;
lbl_222_bss_71 = field_0x7d8 = 2;
lbl_222_bss_70 = 0;
case 30:
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 3);
@@ -764,11 +764,13 @@ void daE_PZ_c::executeOpeningDemo() {
sp120.set(mPzCenterInit_dt[7]);
sp108 = mDemoCameraCenter - sp120;
cLib_addCalcPos(&mDemoCameraCenter, sp120, 0.7f, sp108.abs() / 20.0f, 1.0f);
var_f31 = sp108.abs() / 20.0f;
cLib_addCalcPos(&mDemoCameraCenter, sp120, 0.7f, var_f31, 1.0f);
sp114.set(mPzEyeInit_dt[7]);
spFC = mDemoCameraEye - sp114;
cLib_addCalcPos(&mDemoCameraEye, sp114, 0.7f, spFC.abs() / 20.0f, 1.0f);
var_f31 = spFC.abs() / 20.0f;
cLib_addCalcPos(&mDemoCameraEye, sp114, 0.7f, var_f31, 1.0f);
if (field_0x7d0 == 0) {
if (fopAcM_SearchByID(parentActorID, &parent) && parent != NULL) {
@@ -851,7 +853,7 @@ void daE_PZ_c::executeOpeningDemo() {
if (field_0x7d7 != 0) {
if (field_0x7d7 == 1) {
data_80761E28 = 1;
lbl_222_bss_70 = 1;
mDemoCameraCenter.set(mPzCenterInit_dt[17]);
mDemoCameraEye.set(mPzEyeInit_dt[17]);
@@ -956,11 +958,13 @@ void daE_PZ_c::executeOpeningDemo() {
case 106:
sp120.set(mPzCenterInit_dt[12]);
sp108 = mDemoCameraCenter - sp120;
cLib_addCalcPos(&mDemoCameraCenter, sp120, 0.7f, sp108.abs() / 10.0f, 1.0f);
var_f31 = sp108.abs() / 10.0f;
cLib_addCalcPos(&mDemoCameraCenter, sp120, 0.7f, var_f31, 1.0f);
sp114.set(mPzEyeInit_dt[12]);
spFC = mDemoCameraEye - sp114;
cLib_addCalcPos(&mDemoCameraEye, sp114, 0.7f, spFC.abs() / 10.0f, 1.0f);
var_f31 = spFC.abs() / 10.0f;
cLib_addCalcPos(&mDemoCameraEye, sp114, 0.7f, var_f31, 1.0f);
if (field_0x7d0 != 0 || sp108.abs() > 2.0f || spFC.abs() > 2.0f) {
break;
@@ -998,10 +1002,10 @@ void daE_PZ_c::executeOpeningDemo() {
case 109:
if (mAnm == 0xB && mpModelMorf->isStop()) {
setBck(0xD, 2, 3.0f, 1.0f);
parentActorID = fopAcM_createChild(PROC_E_PZ, fopAcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
// fakematch, fpcM_GetID should be fopAcM_GetID
parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
field_0x7d8 = 2;
data_80761E29 = 2;
lbl_222_bss_71 = field_0x7d8 = 2;
}
if (mAnm != 0xB && mAnm != 0xD) {
@@ -1147,11 +1151,12 @@ void daE_PZ_c::executeOpeningDemo() {
} else {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 0, 0);
}
mDemoCameraCenter.set(mPzCenterInit_dt[3]);
mDemoCameraEye.set(mPzEyeInit_dt[4]);
parentActorID = fopAcM_createChild(PROC_E_PZ, fopAcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
// fakematch, fpcM_GetID should be fopAcM_GetID
parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
setBck(0xC, 0, 10.0f, 1.0f);
daPy_getPlayerActorClass()->changeDemoMode(0x10, 0, 0, 0);
@@ -1447,7 +1452,7 @@ void daE_PZ_c::executeAttack() {
}
var_r27++;
if (data_80761E29 != var_r28) {
if (lbl_222_bss_71 != var_r28) {
field_0x7d8 = var_r28;
var_r27 = 100;
}
@@ -1967,7 +1972,7 @@ void daE_PZ_c::executeSummonsBullet() {
if (((daE_PZ_c*)sp8C)->field_0x7dc[field_0x7d7] == 0) {
sp84 = BIRTH_DT[((daE_PZ_c*)sp8C)->field_0x7d8].parameters;
data_80761E29 = ((daE_PZ_c*)sp8C)->field_0x7d8;
lbl_222_bss_71 = ((daE_PZ_c*)sp8C)->field_0x7d8;
if (((daE_PZ_c*)sp8C)->field_0x7d8 == 2) {
sp84 |= field_0x7d7 << 8;
@@ -2062,7 +2067,7 @@ void daE_PZ_c::executeSummonsBullet() {
if (((daE_PZ_c*)sp88)->field_0x841 != 0) {
field_0x7d7 = 1;
if (data_80761E28 == 0) {
if (lbl_222_bss_70 == 0) {
break;
}