diff options
| author | Benjamin ROELANDT <benjamin.roelandt@gmail.com> | 2026-08-02 17:45:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-02 11:45:21 -0400 |
| commit | dbc093a3cfefac7f38088aa14c07115390d14fe5 (patch) | |
| tree | edf45d983965649c16535eef7c2443c403643595 /src/d/actor | |
| parent | 6b911411f071a174d794ced3a583fceff8073446 (diff) | |
* First version of d_scope, everything is matching on all version, probably missing a few inline on undocumented field that i did not manage to find
* Readd stuff previously deleted but badly tested
* Rename some fields and a few more inline
doesn't improve matching but i think it looks more genuine
* clean up syntax
* move d_scptyp enum and add forgotten inline
* build fix
* replace seStart call with proper enum
Diffstat (limited to 'src/d/actor')
| -rw-r--r-- | src/d/actor/d_a_npc_ls1.cpp | 4 | ||||
| -rw-r--r-- | src/d/actor/d_a_player_main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index d7da503d..4abc19a8 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -1800,7 +1800,7 @@ bool daNpc_Ls1_c::telescope_proc() { u8 scope_mesg_status = dComIfGp_getScopeMesgStatus(); if (scope_mesg_status == fopMsgStts_MSG_UNK0_e) { if (dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e) != 0) { - if (g_dComIfG_gameInfo.play.field_0x4978) { + if (g_dComIfG_gameInfo.play.mScopeWipeFlag) { daPy_getPlayerLinkActorClass()->setPlayerPosAndAngle(&m7CC[1], 0xCC70); } dComIfGp_setScopeType(1); @@ -1836,7 +1836,7 @@ bool daNpc_Ls1_c::telescope_proc() { } // fallthrough case fopMsgStts_CLOSE_WAIT_e: - case fopMsgStts_UNKD_e: + case fopMsgStts_SCOPE_WAIT_e: { u32 temp_msg_no; switch (m833) { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index d155f5c7..36808991 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -5663,7 +5663,7 @@ BOOL daPy_lk_c::checkPhotoBoxItem(int itemNo) const { /* 80112064-80112100 .text checkScopeEnd__9daPy_lk_cFv */ BOOL daPy_lk_c::checkScopeEnd() { - if (dComIfGp_getScopeMesgStatus() == fopMsgStts_UNKB_e && + if (dComIfGp_getScopeMesgStatus() == fopMsgStts_SCOPE_ACTIVE_e && (cancelTrigger() || checkNoResetFlg0(daPyFlg0_SCOPE_CANCEL))) { if (dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e) || cancelTrigger()) { |