diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2025-09-20 12:09:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-20 22:09:06 +0300 |
| commit | affd5d7f95da627b2d2ebaf5a7d34878f15fc9ab (patch) | |
| tree | 186894608b5c3e393c8863938676e8d6b5c0858c /src/d/actor/d_a_obj_so.cpp | |
| parent | 72236276a6af973baefd612f0a3d4fecccbab4e9 (diff) | |
d_a_obj_kanban2 & more OK (#2674)
* d_a_obj_kanban2 OK via gameInfo fakematch
Closes #1001
* Mark d_a_obj_kanban2 as matching for JP
* Mark npc_jagar as Matching
* d_a_tag_allmato OK via gameInfo fake match
* d_a_obj_wchain OK
* d_a_obj_so OK
---------
Co-authored-by: Max Roncace <me@caseif.net>
Diffstat (limited to 'src/d/actor/d_a_obj_so.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_so.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 72c7ef90b1..7127124824 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -417,14 +417,13 @@ static void action(obj_so_class* i_this) { /* 80CE14DC-80CE2A64 0011FC 1588+00 1/1 0/0 0/0 .text part_move__FP12obj_so_class */ static void part_move(obj_so_class* i_this) { - // NONMATCHING static u16 e_id[3] = { 0x82AB, 0x82AC, 0x82AD, }; - fopAc_ac_c* player = dComIfGp_getPlayer(0); + fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0); fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor; cXyz spec, spf8, sp104; s16 tempCos; @@ -519,8 +518,7 @@ static void part_move(obj_so_class* i_this) { } } else { i_this->field_0x8f0[i].y = -10.0f; - i_this->field_0x8f0[i].z = 0.0f; - i_this->field_0x8f0[i].x = 0.0f; + i_this->field_0x8f0[i].x = i_this->field_0x8f0[i].z = 0.0f; if (daPy_getPlayerActorClass()->checkFrontRollCrash()) { spec.x = player->current.pos.x - i_this->field_0x618[i].x; spec.y = -(player->current.pos.y - i_this->field_0x618[i].y); @@ -715,8 +713,8 @@ static void part_move(obj_so_class* i_this) { spec.y = 0.0f; spec.z = (50.0f - var_f29) * (JREG_F(1) + 100.0f); MtxPosition(&spec, &spf8); - cLib_addCalcAngleS2(&i_this->field_0x1b20[i], spec.z, 2, 0x400); - cLib_addCalcAngleS2(&i_this->field_0x1b30[i], -spec.x, 2, 0x400); + cLib_addCalcAngleS2(&i_this->field_0x1b20[i], spf8.z, 2, 0x400); + cLib_addCalcAngleS2(&i_this->field_0x1b30[i], -spf8.x, 2, 0x400); } } |