diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-10 21:25:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-10 18:25:00 -0800 |
| commit | 23a1c940630435eaa0bbca45fb24156fc0d3db62 (patch) | |
| tree | c2b05e860562425bd3147046e19bcf8130ad4625 /src/d/actor/d_a_npc_gra.cpp | |
| parent | a02f72d8f3a87a2d2ddde062301d3639050e1e35 (diff) | |
Regalloc/debug/misc fixes (#2794)
* Fix "0" asserts
* More debug and regalloc fixes
* Fix PTMF syntax for compatibility with other compilers
* Fix some fakematches, link more TUs for J/P
Diffstat (limited to 'src/d/actor/d_a_npc_gra.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_gra.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 9291437129..62108da632 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -1884,14 +1884,7 @@ enum Event_Cut_Nums { BOOL daNpc_grA_c::doEvent() { dEvent_manager_c* manager = NULL; BOOL ret = FALSE; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck() != FALSE) { manager = &dComIfGp_getEventManager(); if (field_0x1691 == 0) { mOrderNewEvt = 0; @@ -1936,41 +1929,25 @@ BOOL daNpc_grA_c::doEvent() { if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && manager->endCheck(mEventIdx)) { switch (mOrderEvtNo) { case 5: -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mOrderEvtNo = 0; mEventIdx = -1; field_0x1693 = field_0x1692 = 0; fpcM_Search(s_subCarry, this); break; case 6: -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mOrderEvtNo = 0; mEventIdx = -1; break; case 7: -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mOrderEvtNo = 0; mEventIdx = -1; fopAcM_delete(this); break; default: -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mOrderEvtNo = 0; mEventIdx = -1; break; |