mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-27 00:45:10 -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/actor/d_a_obj_table.cpp
+14 -10
View File
@@ -42,7 +42,7 @@ int daObjTable_c::create() {
}
static int daObjTable_Draw(daObjTable_c* i_this) {
return i_this->Draw();
return i_this->MoveBGDraw();
}
static int daObjTable_Execute(daObjTable_c* i_this) {
@@ -64,6 +64,7 @@ static int daObjTable_Create(fopAc_ac_c* i_this) {
int daObjTable_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
JUT_ASSERT(76, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpModel == NULL) {
@@ -140,23 +141,26 @@ int daObjTable_c::Create() {
int daObjTable_c::Execute(Mtx** i_mtx) {
eventInfo.onCondition(1);
dComIfG_inf_c& gameInfo = g_dComIfG_gameInfo;
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (mMsgFlow.doFlow(this, NULL, 0) != 0) {
gameInfo.play.getEvent().reset(this); // Fake match?
dComIfGp_getEvent()->reset(this);
eventInfo.setArchiveName("Table");
dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
mEventID = dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1);
fopAcM_orderChangeEventId(this, mEventID, 1, -1);
int r27 = fopAcM_orderChangeEventId(this, mEventID, 1, -1);
}
} else {
dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
int staffId = evtMgr.getMyStaffId(l_arcName, NULL, 0);
if (staffId != -1 &&
eventInfo.checkCommandDemoAccrpt() && mEventID != -1 &&
evtMgr.endCheck(mEventID))
{
mEventID = -1;
dMeter2Info_setPauseStatus(7);
}
} else if (dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0) != -1 &&
eventInfo.checkCommandDemoAccrpt() && mEventID != -1 &&
dComIfGp_getEventManager().endCheck(mEventID))
{
mEventID = -1;
dMeter2Info_setPauseStatus(7);
}
} else {
mMsgFlow.init(this, getMessageNo(), 0, NULL);