diff options
| author | Carco_21 <144170194+carter-ktb21@users.noreply.github.com> | 2025-05-30 06:49:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-30 13:49:24 +0300 |
| commit | bc945599045ebcf8e8f88ea3560e89fb36ba3968 (patch) | |
| tree | 5125e902f7c1fb8141589bc7eaed5bfd7b9fec6b /src/d/actor/d_a_e_fs.cpp | |
| parent | 6fd5560738b856d59575f8d26f1d02b64def0d76 (diff) | |
d_a_npc_ks work (#2461)
* Initial work
* Work on ori2 and others
* Work on npc_ks_home
* Work on npc_ks_demo_022
* Chugging through
* Started on demo_camera
* More demo_camera work
* 51% equivalent
* General cleanup
* Fixed compile error in d_a_e_mk
* Small d_a_e_mk fix
* d_a_e_fs fix
* PR cleanup
* Started work on d_a_obj_sw
Diffstat (limited to 'src/d/actor/d_a_e_fs.cpp')
| -rw-r--r-- | src/d/actor/d_a_e_fs.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 3cf593e4fa..41b10845a7 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -478,7 +478,6 @@ static bool checkViewArea(cXyz* i_pos) { } /* 806BCE5C-806BD0A8 00147C 024C+00 2/1 0/0 0/0 .text e_fs_demowait__FP10e_fs_class */ -// NONMATCHING regalloc static void e_fs_demowait(e_fs_class* i_this) { cXyz delta; npc_ks_class* monkey = (npc_ks_class*)fopAcM_SearchByName(PROC_NPC_KS); @@ -499,8 +498,8 @@ static void e_fs_demowait(e_fs_class* i_this) { break; case 2: - delta.x = monkey->current.pos.x - i_this->current.pos.x; - delta.z = monkey->current.pos.z - i_this->current.pos.z; + delta.x = monkey->actor.current.pos.x - i_this->current.pos.x; + delta.z = monkey->actor.current.pos.z - i_this->current.pos.z; i_this->mTargetAngleY = cM_atan2s(delta.x, delta.z); if (i_this->mAcch.ChkGroundHit()) { i_this->mpMorf->setPlaySpeed(1.0f); |