diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-06-30 16:20:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 16:20:26 -0700 |
| commit | 7d2e4e81dc2e1e598b41fc41a859faa8668514e8 (patch) | |
| tree | 7ceebcfd86a24530ea395c146ac1759683bd585b /src/d/menu/d_menu_window.cpp | |
| parent | 046d178003035ea87d3042a61917c2d482c68c74 (diff) | |
| parent | a2e21275cb2722aed941cd5290b57b29732ce6d7 (diff) | |
Merge pull request #202 from lepelog/inline-stuff
move inlines
Diffstat (limited to 'src/d/menu/d_menu_window.cpp')
| -rw-r--r-- | src/d/menu/d_menu_window.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 286e53a653..d18b471145 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -271,10 +271,6 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -inline BOOL dComIfGp_event_runCheck() { - return g_dComIfG_gameInfo.play.getEvent().runCheck(); -} - BOOL dMw_UP_TRIGGER() { return (bool)mDoCPd_c::getTrigUp(PAD_1); } @@ -2343,17 +2339,9 @@ BOOL dMw_c::dMw_isPush_S_Button() { return false; } -inline dEvt_control_c& dComIfGp_getEvent() { - return g_dComIfG_gameInfo.play.getEvent(); -} - -inline u16 dComIfGs_getLife() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); -} - /* 801FCDD8-801FCE08 1F7718 0030+00 1/1 0/0 0/0 .text isPauseReady__5dMw_cFv */ bool dMw_c::isPauseReady() { - if (dComIfGp_getEvent().checkCompulsory() || dComIfGs_getLife() == 0) { + if (i_dComIfGp_getEvent().checkCompulsory() || i_dComIfGs_getLife() == 0) { return false; } return true; @@ -2420,7 +2408,7 @@ bool dMw_c::isEventCheck() { field_0x148 = 0; } - if (dComIfGp_event_runCheck()) { + if (i_dComIfGp_event_runCheck()) { if (!dMsgObject_isTalkNowCheck() && (dMeter2Info_getMapStatus() == 4 || dMeter2Info_getMapStatus() == 5 || dMeter2Info_getMapStatus() == 7 || dMeter2Info_getMapStatus() == 8 || |