mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-29 19:42:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

move inlines

Browse Source
This commit is contained in:
lepelog
2022-06-30 23:24:35 +02:00
parent 046d178003
commit e71aa4578d
60 changed files with 620 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/event/d_event_manager.cpp
+17 -25
View File
@@ -134,14 +134,6 @@ extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
inline dEvent_manager_c& dComIfGp_getEventManager() {
return g_dComIfG_gameInfo.play.getEvtManager();
}
inline dEvt_control_c& dComIfGp_getEvent() {
return g_dComIfG_gameInfo.play.getEvent();
}
BOOL daPy_py_c::checkNowWolf() {
return dComIfGp_getLinkPlayer()->i_checkWolf();
}
@@ -433,15 +425,15 @@ void dEvent_manager_c::endProc(s16 param_0, int param_1) {
event->mEventState = 0;
mCurrentEventType = 0;
mCurrentEventCompositId = -1;
dComIfGp_getEvent().setPtD(NULL);
dComIfGp_getEvent().setPtI(NULL);
i_dComIfGp_getEvent().setPtD(NULL);
i_dComIfGp_getEvent().setPtI(NULL);
}
}
}
/* 80046E64-800473FC 0417A4 0598+00 0/0 1/1 0/0 .text Sequencer__16dEvent_manager_cFv */
void dEvent_manager_c::Sequencer() {
dEvt_control_c& evtControl = dComIfGp_getEvent();
dEvt_control_c& evtControl = i_dComIfGp_getEvent();
dEvDtEvent_c* event = this->getEventData(mCurrentEventCompositId);
dStage_MapEvent_dt_c* mapEvent = evtControl.getStageEventDt();
if (event != NULL) {
@@ -804,7 +796,7 @@ int dEvent_manager_c::startCheckOld(char const* pName) {
/* 80047A78-80047ADC 0423B8 0064+00 1/1 2/2 122/122 .text endCheck__16dEvent_manager_cFs
*/
int dEvent_manager_c::endCheck(s16 param_0) {
dEvDtEvent_c* event = this->getEventData(dComIfGp_getEvent().runningEventID(param_0));
dEvDtEvent_c* event = this->getEventData(i_dComIfGp_getEvent().runningEventID(param_0));
if (event == NULL) {
return 0;
} else {
@@ -827,7 +819,7 @@ int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, i
int staffNum;
int i;
int evtIdx = -1;
if (dComIfGp_getEvent().getMode() == 0) {
if (i_dComIfGp_getEvent().getMode() == 0) {
return -1;
} else {
if (pActor != NULL) {
@@ -895,7 +887,7 @@ int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, i
/* 80047D4C-80047DAC 04268C 0060+00 0/0 9/9 417/417 .text getIsAddvance__16dEvent_manager_cFi */
int dEvent_manager_c::getIsAddvance(int param_0) {
if (dComIfGp_getEvent().getMode() == 0) {
if (i_dComIfGp_getEvent().getMode() == 0) {
return 0;
} else if (param_0 == -1) {
return 0;
@@ -930,7 +922,7 @@ static int dEvmng_strcmp(char const* param_0, char* param_1) {
* getMyActIdx__16dEvent_manager_cFiPCPCciii */
int dEvent_manager_c::getMyActIdx(int param_0, char const* const* param_1, int param_2, int param_3,
int param_4) {
if (dComIfGp_getEvent().getMode() == 0) {
if (i_dComIfGp_getEvent().getMode() == 0) {
return 0;
} else if (param_0 == -1) {
return -1;
@@ -974,7 +966,7 @@ int dEvent_manager_c::getMyActIdx(int param_0, char const* const* param_1, int p
/* 80047F5C-80047FC8 04289C 006C+00 1/1 9/9 62/62 .text getMyNowCutName__16dEvent_manager_cFi */
char* dEvent_manager_c::getMyNowCutName(int index) {
if (dComIfGp_getEvent().getMode() == 0) {
if (i_dComIfGp_getEvent().getMode() == 0) {
return NULL;
} else if (index == -1) {
return NULL;
@@ -987,7 +979,7 @@ char* dEvent_manager_c::getMyNowCutName(int index) {
/* 80047FC8-800480EC 042908 0124+00 2/2 0/0 0/0 .text getMyDataP__16dEvent_manager_cFiPCci */
dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) {
if (dComIfGp_getEvent().getMode() == 0) {
if (i_dComIfGp_getEvent().getMode() == 0) {
return NULL;
} else if (index == -1) {
return NULL;
@@ -1039,7 +1031,7 @@ int dEvent_manager_c::getMySubstanceNum(int index, char const* name) {
*/
#ifdef NONMATCHING
void dEvent_manager_c::cutEnd(int index) {
if (dComIfGp_getEvent().getMode() == 0) {
if (i_dComIfGp_getEvent().getMode() == 0) {
return;
} else if (index == -1) {
return;
@@ -1170,8 +1162,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) {
goal.x += cM_ssin(angle) * 100;
goal.z += cM_scos(angle) * 100;
this->setGoal(&goal);
dComIfGp_getEvent().setPt2(shutterActor);
dComIfGp_getEvent().setPtD(shutterActor);
i_dComIfGp_getEvent().setPt2(shutterActor);
i_dComIfGp_getEvent().setPtD(shutterActor);
}
return shutterActor;
}
@@ -1198,7 +1190,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast(char const* pName, int param_1) {
shutterActor = specialCast_Shutter(0x22B, param_1);
}
if (shutterActor != NULL) {
dComIfGp_getEvent().onEventFlag(0x10);
i_dComIfGp_getEvent().onEventFlag(0x10);
}
}
@@ -1214,7 +1206,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast(char const* pName, int param_1) {
/* 80048748-800487F0 043088 00A8+00 1/1 0/0 0/0 .text dEv_talkman_get_action__Fi */
static int dEv_talkman_get_action(int param_0) {
int staffId = dComIfGp_getEventManager().getMyStaffId("TALKMAN", NULL, -1);
int staffId = i_dComIfGp_getEventManager().getMyStaffId("TALKMAN", NULL, -1);
if (staffId == -1) {
return -1;
} else {
@@ -1224,10 +1216,10 @@ static int dEv_talkman_get_action(int param_0) {
"TALK0",
"TALK1",
};
int actIdx = dComIfGp_getEventManager().getMyActIdx(staffId, action_table,
int actIdx = i_dComIfGp_getEventManager().getMyActIdx(staffId, action_table,
ARRAY_SIZE(action_table), 0, 0);
if (actIdx == param_0) {
dComIfGp_getEventManager().cutEnd(staffId);
i_dComIfGp_getEventManager().cutEnd(staffId);
}
return actIdx;
}
@@ -1240,7 +1232,7 @@ int dEvent_manager_c::ChkPresentEnd() {
/* 8004882C-8004886C 04316C 0040+00 0/0 2/2 2/2 .text checkStartDemo__16dEvent_manager_cFv */
int dEvent_manager_c::checkStartDemo() {
if (!dComIfGp_getEvent().runCheck()) {
if (!i_dComIfGp_getEvent().runCheck()) {
return 0;
}