diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-24 19:57:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-24 16:57:36 -0800 |
| commit | 229527daf71c76965ef0735abca530cee68b7358 (patch) | |
| tree | 0325055c01866d359b1556a2cbc6b65cbd238466 /src/d/d_event.cpp | |
| parent | cefe919b8d39cb5b60d79b1dc7452e80abdf9657 (diff) | |
Resolve all gameInfo fakematches (#2995)
* Clean up various inlines/fakematches/comments
* Copy OptRuby inline name from TWW debug
* Resolve all dEvt_control_c related fakematches, return pointer instead of reference
* Fix some more missing inline usages
Diffstat (limited to 'src/d/d_event.cpp')
| -rw-r--r-- | src/d/d_event.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 458dc0c59f..7958ea5fad 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -728,16 +728,16 @@ void dEvt_control_c::clearSkipSystem() { int dEv_defaultSkipProc(void* actor, int parameter) { // "%06d: event: skip event!!!" OS_REPORT("\x1b[34m%06d: event: スキップ event!!!\n\x1b[m", g_Counter.mCounter0); - dEvt_control_c& event = dComIfGp_getEvent(); + dEvt_control_c* event = dComIfGp_getEvent(); - event.reset(actor); + event->reset(actor); return 1; } int dEv_defaultSkipZev(void* actor, int parameter) { // "%06d: event: skip ZEV event!!!" OS_REPORT("\x1b[34m%06d: event: スキップ ZEV event!!!\n\x1b[m", g_Counter.mCounter0); - dEvt_control_c* event = &dComIfGp_getEvent(); + dEvt_control_c* event = dComIfGp_getEvent(); s16 eventID = -1; dStage_MapEvent_dt_c* data = event->getStageEventDt(); @@ -761,9 +761,9 @@ int dEv_defaultSkipZev(void* actor, int parameter) { OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, eventName); break; case 1: - skipName = dComIfGp_getEvent().getSkipEventName(); + skipName = dComIfGp_getEvent()->getSkipEventName(); eventID = dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); - OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent().getSkipEventName()); + OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent()->getSkipEventName()); break; default: OS_REPORT("%06d: event: ERROR: illegal prameter!\n", g_Counter.mCounter0); @@ -785,7 +785,7 @@ int dEv_defaultSkipZev(void* actor, int parameter) { int dEv_defaultSkipStb(void* actor, int parameter) { OS_REPORT("\x1b[34m%06d: event: スキップ STB event!!!\n\x1b[m", g_Counter.mCounter0); - dEvt_control_c* event = &dComIfGp_getEvent(); + dEvt_control_c* event = dComIfGp_getEvent(); s16 eventID = -1; dStage_MapEvent_dt_c* data = event->getStageEventDt(); @@ -809,9 +809,9 @@ int dEv_defaultSkipStb(void* actor, int parameter) { OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, eventName); break; case 1: - skipName = dComIfGp_getEvent().getSkipEventName(); + skipName = dComIfGp_getEvent()->getSkipEventName(); eventID = dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); - OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent().getSkipEventName()); + OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent()->getSkipEventName()); break; default: OS_REPORT("%06d: event: ERROR: illegal prameter!\n", g_Counter.mCounter0); @@ -834,7 +834,7 @@ int dEv_defaultSkipStb(void* actor, int parameter) { } int dEv_noFinishSkipProc(void* actor, int parameter) { - dComIfGp_getEvent().offSkipFade(); + dComIfGp_getEvent()->offSkipFade(); return 0; } |