diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-02-02 20:34:16 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-02-02 20:34:16 -0500 |
| commit | b46e8978265e717f2ae0dc6f3793b7f694a982db (patch) | |
| tree | 0458474921d420f4c918be4e1032ac425cc8049e /src/d/actor/d_a_player_npc.cpp | |
| parent | b6c878a65254d4c1fc8c8f1b7763d8868284f00e (diff) | |
Realmatch dComIfGp_event_runCheck inline
dComIfGp_event_runCheck's return type being different from the inner inline runCheck's return type apparently causes the compiler to double up the g_dComIfG_gameInfo load in certain functions.
And also fix dComIfGp_event_chkEventFlag which had the same issue.
Diffstat (limited to 'src/d/actor/d_a_player_npc.cpp')
| -rw-r--r-- | src/d/actor/d_a_player_npc.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp index 208ca12a..4168db90 100644 --- a/src/d/actor/d_a_player_npc.cpp +++ b/src/d/actor/d_a_player_npc.cpp @@ -159,9 +159,7 @@ BOOL daPy_npc_c::initialRestartOption(s8 option, int save) { /* 8015ABD8-8015AC74 .text checkNowPosMove__10daPy_npc_cFPCc */ BOOL daPy_npc_c::checkNowPosMove(const char* pName) { - // Using the dComIfGp_event_runCheck inline makes the codegen not match. - // if (!dComIfGp_event_runCheck()) { - if (!g_dComIfG_gameInfo.play.getEvent().runCheck()) { + if (!dComIfGp_event_runCheck()) { return TRUE; } if (mEvtInfo.checkCommandTalk()) { |