mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-21 06:28:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tbox2 done, f_op_actor_mng cleanup, cleanup fopAc_ac_c member names (#2084)

Browse Source
This commit is contained in:
TakaRikka
2024-03-04 17:33:13 -08:00
committed by GitHub
parent 7ba8c332c7
commit 22e941fd8c
334 changed files with 3797 additions and 6195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/event/d_event_manager.cpp
+11 -11
View File
@@ -379,7 +379,7 @@ void dEvent_manager_c::Sequencer() {
int cutType = dStage_MapEvent_dt_c_getEventSCutType(mapEvent);
if (iVar5 && cutType != 1) {
bVar1 = true;
cXyz attentionPos(dComIfGp_getPlayer(0)->mAttentionInfo.mPosition);
cXyz attentionPos(dComIfGp_getPlayer(0)->attention_info.position);
cXyz camCenter = dCam_getBody()->Center();
f32 distance = cXyz((attentionPos - camCenter)).abs();
@@ -553,7 +553,7 @@ s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 mapToolID, s32 roomN
/* 80047698-80047758 041FD8 00C0+00 0/0 3/3 25/25 .text
* getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc */
s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 mapToolID) {
dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, pActor->getRoomNo());
dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, fopAcM_GetRoomNo(pActor));
if (data != NULL) {
switch (data->mType) {
case 1:
@@ -571,7 +571,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 mapToolID) {
/* 80047758-80047930 042098 01D8+00 1/1 10/10 92/92 .text
* getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc */
s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 mapToolID) {
s8 actorRoomNo = pActor->getRoomNo();
s8 actorRoomNo = fopAcM_GetRoomNo(pActor);
if (mapToolID != 0xFF) {
dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, actorRoomNo);
@@ -599,9 +599,9 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8
dEvDtBase_c* eventP = &mEventList[type];
dEvDtBase_c event;
if (type < 4 || 9 < type || actorRoomNo == mEventList[type].roomNo()) {
if (pActor != NULL && type == 2 && pActor->mEvtInfo.getArchiveName() != NULL) {
if (pActor != NULL && type == 2 && pActor->eventInfo.getArchiveName() != NULL) {
event.init(
(char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName),
(char*)dComIfG_getObjectRes(pActor->eventInfo.getArchiveName(), DataFileName),
-1);
eventP = &event;
}
@@ -693,7 +693,7 @@ int dEvent_manager_c::getMyStaffId(char const* staffName, fopAc_ac_c* pActor, in
return -1;
} else {
if (pActor != NULL) {
evtIdx = pActor->mEvtInfo.getIdx();
evtIdx = pActor->eventInfo.getIdx();
}
if (mCurrentEventCompositId == -1) {
return -1;
@@ -920,9 +920,9 @@ int dEvent_manager_c::getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId) {
dEvDtEvent_c* event = NULL;
dEvDtBase_c eventBase;
if (getTypeCompositId(eventCompositId) == 2 && pActor != NULL &&
pActor->mEvtInfo.getArchiveName() != NULL)
pActor->eventInfo.getArchiveName() != NULL)
{
char* data = (char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName);
char* data = (char*)dComIfG_getObjectRes(pActor->eventInfo.getArchiveName(), DataFileName);
eventBase.init(data, -1);
event = eventBase.mEventP;
}
@@ -1002,7 +1002,7 @@ static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* pActor, void* param_1) {
return NULL;
}
cXyz diff = pActor->orig.pos - prms->mActor->orig.pos;
cXyz diff = pActor->home.pos - prms->mActor->home.pos;
if (diff.x < 10 && diff.x > -10 && diff.y < 10 && diff.y > -10 && diff.z < 10 && diff.z > -10) {
return pActor;
}
@@ -1019,8 +1019,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) {
(fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)findShutterCallBack, &prms);
if (shutterActor != NULL && param_1 != 0) {
cXyz goal(shutterActor->orig.pos);
s16 angle = prms.mActor->orig.angle.y + 0x8000;
cXyz goal(shutterActor->home.pos);
s16 angle = prms.mActor->home.angle.y + 0x8000;
goal.x += cM_ssin(angle) * 100;
goal.z += cM_scos(angle) * 100;
setGoal(&goal);