mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Finish renaming subtype to argument (#2659)

Browse Source
This commit is contained in:
LagoLunatic
2025-09-14 16:17:54 -04:00
committed by GitHub
parent adb6c71567
commit 8c5d05cd54
6 changed files with 78 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_event_data.cpp
+28 -15
View File
@@ -389,7 +389,7 @@ void dEvDtStaff_c::specialProcLight() {
f32* hourP;
switch (*(int*)nowCutName) {
case 'CHAN':
case 'CHAN': {
hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour");
if (hourP != NULL) {
dKy_instant_timechg(*hourP * 15.0f);
@@ -403,6 +403,7 @@ void dEvDtStaff_c::specialProcLight() {
}
}
break;
}
case 'ADD_':
hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour");
if (hourP != NULL) {
@@ -452,7 +453,7 @@ void dEvDtStaff_c::specialProcMessage() {
case 'FINI':
work->mLMsg->mode = 0x10;
break;
case 'CONT':
case 'CONT': {
work->mLMsg->mode = 0xF;
int* ptr = dComIfGp_evmng_getMyIntegerP(staffId, "msgNo");
if (ptr == NULL) {
@@ -461,7 +462,8 @@ void dEvDtStaff_c::specialProcMessage() {
work->mMsgNo = *ptr;
fopMsgM_messageSet(work->mMsgNo, 1000);
break;
case 'SAVE':
}
case 'SAVE': {
work->mMsgNo = 1;
int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
if (typeP != NULL && *typeP == 1) {
@@ -469,7 +471,8 @@ void dEvDtStaff_c::specialProcMessage() {
}
work->_0 = d_GameOver_Create(work->mMsgNo);
break;
case 'TELO':
}
case 'TELO': {
int* forStartP = dComIfGp_evmng_getMyIntegerP(staffId, "ForStart");
if (forStartP != NULL && *forStartP != 0) {
@@ -491,6 +494,7 @@ void dEvDtStaff_c::specialProcMessage() {
work->_0 = fopMsgM_messageSetDemo(work->mMsgNo);
}
}
}
}
switch (*(int*)nowCutName) {
@@ -624,7 +628,7 @@ void dEvDtStaff_c::specialProcSound() {
case 'NOMS':
specialProc_WaitStart(staffId);
break;
case 'RIDD':
case 'RIDD': {
int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
if (typeP != NULL && *typeP == 1) {
mDoAud_seStart(Z2SE_READ_RIDDLE_A, NULL, 0, 0);
@@ -632,12 +636,14 @@ void dEvDtStaff_c::specialProcSound() {
mDoAud_seStart(Z2SE_READ_RIDDLE_B, NULL, 0, 0);
}
break;
case 'BGMS':
}
case 'BGMS': {
int* timerP = dComIfGp_evmng_getMyIntegerP(staffId, "Timer");
if (timerP != NULL) {
mDoAud_bgmStop(*timerP);
}
}
}
}
switch (*(int*)nowCutName) {
@@ -707,8 +713,8 @@ void dEvDtStaff_c::specialProcCreate() {
scale = *scaleP;
}
fopAcM_create(objNameInf->mProcName, arg, &pos, dComIfGp_roomControl_getStayNo(),
&angle, &scale, objNameInf->mSubtype);
fopAcM_create(objNameInf->procname, arg, &pos, dComIfGp_roomControl_getStayNo(),
&angle, &scale, objNameInf->argument);
break;
}
}
@@ -779,7 +785,7 @@ void dEvDtStaff_c::specialProcDirector() {
case 'NEXT':
dEvDt_Next_Stage(staffId, 0xD);
break;
case 'SKIP':
case 'SKIP': {
char* zev = dComIfGp_evmng_getMyStringP(staffId, "Zev");
// cast needed to match
void* pt = (void*)evtControl.getPt1();
@@ -793,7 +799,8 @@ void dEvDtStaff_c::specialProcDirector() {
evtControl.setSkipProc(pt, dEv_defaultSkipProc, 0);
}
break;
case 'FADE':
}
case 'FADE': {
f32* rateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate");
int* colorP = dComIfGp_evmng_getMyIntegerP(staffId, "Color");
@@ -811,13 +818,15 @@ void dEvDtStaff_c::specialProcDirector() {
mDoGph_gInf_c::fadeOut(*rateP);
}
break;
case 'VIBR':
}
case 'VIBR': {
specialProc_WaitStart(staffId);
int* patternP = dComIfGp_evmng_getMyIntegerP(staffId, "Pattern");
int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
dComIfGp_getVibration().StartQuake((u8*)patternP, 0, *typeP, cXyz(0, 1, 0));
break;
case 'WIPE':
}
case 'WIPE': {
f32* wipeRateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate");
dDlst_list_c::wipeIn(-*wipeRateP);
if (*wipeRateP > 0) {
@@ -834,7 +843,8 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 'MAPT':
}
case 'MAPT': {
int* idP = dComIfGp_evmng_getMyIntegerP(staffId, "ID");
data->unk = *idP;
dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(data->unk);
@@ -848,7 +858,8 @@ void dEvDtStaff_c::specialProcDirector() {
data->unk2 = 0;
}
break;
case 'CAST':
}
case 'CAST': {
char* pt2Name = dComIfGp_evmng_getMyStringP(staffId, "Pt2");
if (pt2Name != NULL) {
fopAc_ac_c* pt2 = fopAcM_searchFromName4Event(pt2Name, -1);
@@ -881,6 +892,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
}
case 'SPEC':
int* specTypeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
if (specTypeP != NULL) {
@@ -1002,7 +1014,7 @@ void dEvDtStaff_c::specialProcPackage() {
case 'WAIT':
specialProc_WaitProc(staffId);
break;
case 'PLAY':
case 'PLAY': {
dEvt_control_c& evtControl = dComIfGp_getEvent();
if (dDemo_c::getMode() == 2) {
dStage_MapEvent_dt_c* event = evtControl.getStageEventDt();
@@ -1018,6 +1030,7 @@ void dEvDtStaff_c::specialProcPackage() {
dComIfGp_evmng_cutEnd(staffId);
}
break;
}
default:
dComIfGp_evmng_cutEnd(staffId);
break;
src/d/d_stage.cpp
+13 -13
View File
@@ -1501,7 +1501,7 @@ dStage_objectNameInf* dStage_searchName(char const* objName) {
dStage_objectNameInf* obj = l_objectName;
for (u32 i = 0; i < ARRAY_SIZEU(l_objectName); i++) {
if (!strcmp(obj->mName, objName)) {
if (!strcmp(obj->name, objName)) {
return obj;
}
obj++;
@@ -1511,33 +1511,33 @@ dStage_objectNameInf* dStage_searchName(char const* objName) {
return NULL;
}
const char* dStage_getName(s16 procName, s8 subtype) {
const char* dStage_getName(s16 procName, s8 argument) {
static char tmp_name[8];
dStage_objectNameInf* obj = l_objectName;
char* tmp = NULL;
for (int i = 0; i < ARRAY_SIZEU(l_objectName); i++) {
if (obj->mProcName == procName) {
if (obj->mSubtype == subtype) {
return obj->mName;
if (obj->procname == procName) {
if (obj->argument == argument) {
return obj->name;
}
if (tmp == NULL) {
tmp = obj->mName;
tmp = obj->name;
}
}
obj++;
}
if (tmp == NULL) {
snprintf(tmp_name, 8, "%d%+0d", procName, subtype);
snprintf(tmp_name, 8, "%d%+0d", procName, argument);
tmp = tmp_name;
}
return tmp;
}
const char* dStage_getName2(s16 procName, s8 subtype) {
return dStage_getName(procName, subtype);
const char* dStage_getName2(s16 procName, s8 argument) {
return dStage_getName(procName, argument);
}
/* 80450D60-80450D64 000260 0004+00 1/1 3/3 1/1 .sbss mProcID__20dStage_roomControl_c */
@@ -1577,9 +1577,9 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c
OS_REPORT("\x1B""[43;30mStage Actor Name Nothing !! <%s>\n\x1B[m", i_actorData->name);
JKRFree(i_actorPrm);
} else {
i_actorPrm->subtype = actorInf->mSubtype;
if (actorInf->mProcName == PROC_SUSPEND) {
fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->mProcName, NULL, NULL, i_actorPrm);
i_actorPrm->argument = actorInf->argument;
if (actorInf->procname == PROC_SUSPEND) {
fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->procname, NULL, NULL, i_actorPrm);
if (actor != NULL) {
fopAcM_delete(actor);
@@ -1587,7 +1587,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c
return;
}
fopAcM_create(actorInf->mProcName, NULL, i_actorPrm);
fopAcM_create(actorInf->procname, NULL, i_actorPrm);
}
}