mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 07:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve all gameInfo fakematches (#2995)

Browse Source 
* 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
This commit is contained in:
LagoLunatic
2025-12-24 19:57:36 -05:00
committed by GitHub
parent cefe919b8d
commit 229527daf7
194 changed files with 767 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_event.cpp
+9 -9
View File
@@ -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;
}