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

d_a_obj_gm almost matching (#2750)

Browse Source 
* linked some objs

* major work

* equivalent

* almost matching

* almost matching

* PR cleanup
This commit is contained in:
Carco_21
2025-10-22 21:39:18 -04:00
committed by GitHub
parent d6711a18c8
commit 4a5752fe52
8 changed files with 757 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_ito.cpp
+10 -10
View File
@@ -72,9 +72,9 @@ static void cut_line_calc(obj_ito_class* i_this, ito_s* param_2, int param_3) {
cXyz sp11c(0.0f, 0.0f, 0.0f);
cXyz sp128;
if (param_2 == &i_this->field_0x103c && actor_p != NULL && actor_p->field_0x60a == 2) {
sp11c = *pos - actor_p->current.pos;
sp11c *= (XREG_F(2) + 0.0018f) * actor_p->speedF;
if (param_2 == &i_this->field_0x103c && actor_p != NULL && actor_p->mAction == 2) {
sp11c = *pos - actor_p->actor.current.pos;
sp11c *= (XREG_F(2) + 0.0018f) * actor_p->actor.speedF;
}
cXyz sp134;
@@ -89,7 +89,7 @@ static void cut_line_calc(obj_ito_class* i_this, ito_s* param_2, int param_3) {
cXyz sp140;
sp104.y = sp104.z = 0.0f;
if (actor_p != NULL && actor_p->field_0x60a == 1) {
if (actor_p != NULL && actor_p->mAction == 1) {
bVar1 = true;
cMtx_YrotS(*calc_mtx, actor_p->field_0x64c[0] + param_3 * (hREG_S(3) + 18000));
sp104.x = hREG_F(8) + 2.0f;
@@ -248,7 +248,7 @@ static void action(obj_ito_class* i_this) {
spe8 = i_this->field_0x618 - a_this->current.pos;
i_this->field_0x624 = a_this->current.pos + (spe8 * 0.5f);
if (actor_p->field_0x60a == 0) {
if (actor_p->mAction == 0) {
spe8 = actor_p->field_0x654[i_this->field_0x570] - actor_p->field_0x66c[i_this->field_0x570];
i_this->field_0x624 += spe8 * (TREG_F(5) + 0.25f);
}
@@ -342,14 +342,14 @@ static void action(obj_ito_class* i_this) {
if (i_this->field_0x678[i].ChkCoHit()) {
fopAc_ac_c* var_r25 = i_this->field_0x678[i].GetCoHitObj()->GetAc();
if (actor_p != NULL && var_r25 != actor_p) {
if (actor_p != NULL && var_r25 != &actor_p->actor) {
actor_p->field_0xae4 |= 0x4;
}
}
}
if (actor_p != NULL && actor_p->field_0x567 != 0) {
actor_p->field_0x567 = 0;
if (actor_p != NULL && actor_p->actor.field_0x567 != 0) {
actor_p->actor.field_0x567 = 0;
actor_p->field_0xae4 |= 2;
cut_set(i_this, 100);
}
@@ -403,7 +403,7 @@ static void action(obj_ito_class* i_this) {
}
}
if (i_this->field_0x570 == 0 && actor_p->field_0x60a == 2 && i_this->field_0x1038 == 0) {
if (i_this->field_0x570 == 0 && actor_p->mAction == 2 && i_this->field_0x1038 == 0) {
cut_set(i_this, 100);
}
}
@@ -430,7 +430,7 @@ static void action(obj_ito_class* i_this) {
i_this->field_0x1038 = 2;
}
a_this->current.angle = actor_p->current.angle;
a_this->current.angle = actor_p->actor.current.angle;
cMtx_YrotS(*calc_mtx, a_this->current.angle.y);
cMtx_XrotM(*calc_mtx, a_this->current.angle.x);