mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-12 13:34:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-02-23 19:59:54 -05:00
parent 730b74e2e3
commit c4ad9f7241
84 changed files with 406 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_event_data.cpp
+106 -53
View File
@@ -213,11 +213,16 @@ void dEvDtStaff_c::specialProcLight() {
"CHANGE",
"ADD_TIME",
};
enum {
ACT_WAIT,
ACT_CHANGE,
ACT_ADD_TIME,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 1: // CHANGE
case ACT_CHANGE:
{
f32 * pHour = dComIfGp_evmng_getMyFloatP(staffIdx, "Hour");
if (pHour != NULL) {
@@ -234,7 +239,7 @@ void dEvDtStaff_c::specialProcLight() {
}
}
break;
case 2: // ADD_TIME
case ACT_ADD_TIME:
{
f32 * pHour = dComIfGp_evmng_getMyFloatP(staffIdx, "Hour");
if (pHour != NULL) {
@@ -270,6 +275,17 @@ void dEvDtStaff_c::specialProcMessage() {
"TELOP_ON",
"TELOP_OFF",
};
enum {
ACT_WAIT,
ACT_CREATE_MSG,
ACT_PUSHBUTTON,
ACT_FINISH,
ACT_CONTINUE,
ACT_END,
ACT_DELETE,
ACT_TELOP_ON,
ACT_TELOP_OFF,
};
static fpc_ProcID l_msgId;
static msg_class* l_msg;
static int l_msgNo;
@@ -277,10 +293,11 @@ void dEvDtStaff_c::specialProcMessage() {
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: { // CREATE_MSG
case ACT_CREATE_MSG:
{
l_msgId = fpcM_ERROR_PROCESS_ID_e;
l_msg = NULL;
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
@@ -289,12 +306,13 @@ void dEvDtStaff_c::specialProcMessage() {
mWipeDirection = 0;
break;
}
case 3: // FINISH
case 5: // END
case ACT_FINISH:
case ACT_END:
JUT_ASSERT(0x1D8, l_msg);
l_msg->mStatus = fopMsgStts_MSG_ENDS_e;
break;
case 4: { // CONTINUE
case ACT_CONTINUE:
{
JUT_ASSERT(0x1DC, l_msg);
l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e;
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
@@ -303,25 +321,26 @@ void dEvDtStaff_c::specialProcMessage() {
fopMsgM_messageSet(l_msgNo);
break;
}
case 7: { // TELOP_ON
case ACT_TELOP_ON:
{
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "tlpNo");
JUT_ASSERT(0x1E5, idata);
dComIfGp_setStageNameOn(*idata);
specialProc_WaitStart(staffIdx);
break;
}
case 8: // TELOP_OFF
case ACT_TELOP_OFF:
dComIfGp_setStageNameOff();
break;
}
}
switch (actIdx) {
case 0: // WAIT
case 7: // TELOP_ON
case ACT_WAIT:
case ACT_TELOP_ON:
specialProc_WaitProc(staffIdx);
break;
case 1: // CREATE_MSG
case ACT_CREATE_MSG:
switch (mWipeDirection) {
case 0:
l_msgId = fopMsgM_messageSet(l_msgNo);
@@ -340,14 +359,14 @@ void dEvDtStaff_c::specialProcMessage() {
break;
}
break;
case 2: // PUSHBUTTON
case ACT_PUSHBUTTON:
JUT_ASSERT(0x209, l_msg);
if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) {
dComIfGp_evmng_cutEnd(staffIdx);
}
break;
case 3: // FINISH
case 6: // DELETE
case ACT_FINISH:
case ACT_DELETE:
if (!l_msg) {
dComIfGp_evmng_cutEnd(staffIdx);
} else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) {
@@ -357,10 +376,10 @@ void dEvDtStaff_c::specialProcMessage() {
dComIfGp_evmng_cutEnd(staffIdx);
}
break;
case 4: // CONTINUE
case ACT_CONTINUE:
dComIfGp_evmng_cutEnd(staffIdx);
break;
case 5: // END
case ACT_END:
switch (l_msg->mStatus) {
case fopMsgStts_BOX_CLOSING_e:
case fopMsgStts_BOX_CLOSED_e:
@@ -368,7 +387,7 @@ void dEvDtStaff_c::specialProcMessage() {
break;
}
break;
case 8: // TELOP_OFF
case ACT_TELOP_OFF:
if (dComIfGp_checkStageName() == 0) {
dComIfGp_evmng_cutEnd(staffIdx);
}
@@ -397,29 +416,39 @@ void dEvDtStaff_c::specialProcSound() {
"LANDING_DEMO",
"BGMSTOP",
};
enum {
ACT_WAIT,
ACT_STRM_PLAY,
ACT_STRM_DEMO_MJ_SISTER,
ACT_STRM_DEMO_GO_MAJU,
ACT_NOMSG_WAIT,
ACT_RIDDLE,
ACT_LANDING_DEMO,
ACT_BGMSTOP,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: // STRM_PLAY
case ACT_STRM_PLAY:
mDoAud_bgmStreamPlay();
break;
case 2: // STRM_DEMO_MJ_SISTER
case ACT_STRM_DEMO_MJ_SISTER:
mDoAud_bgmStreamPrepare(JA_STRM_DEMO_MJ_SISTER);
break;
case 3: // STRM_DEMO_GO_MAJU
case ACT_STRM_DEMO_GO_MAJU:
mDoAud_bgmStreamPrepare(JA_STRM_DEMO_GO_MAJU);
break;
case 4: // NOMSG_WAIT
case ACT_NOMSG_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 5: // RIDDLE
case ACT_RIDDLE:
mDoAud_seStart(JA_SE_READ_RIDDLE_1);
break;
case 6: // LANDING_DEMO
case ACT_LANDING_DEMO:
{
s32* pPrepare = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "PREPARE");
if (pPrepare != NULL) {
@@ -440,7 +469,7 @@ void dEvDtStaff_c::specialProcSound() {
mDoAud_endLandingDemo();
}
break;
case 7: // BGMSTOP
case ACT_BGMSTOP:
{
u32* pTimer = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
if (pTimer != NULL)
@@ -451,10 +480,10 @@ void dEvDtStaff_c::specialProcSound() {
}
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitProc(staffIdx);
break;
case 4: // NOMSG_WAIT
case ACT_NOMSG_WAIT:
if (mTimer <= dComIfGp_demo_get()->getFrameNoMsg())
dComIfGp_evmng_cutEnd(staffIdx);
break;
@@ -476,13 +505,17 @@ void dEvDtStaff_c::specialProcCreate() {
"WAIT",
"CREATE",
};
enum {
ACT_WAIT,
ACT_CREATE,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
break;
case 1: // CREATE
case ACT_CREATE:
{
const char * name = dComIfGp_evmng_getMyStringP(staffIdx, "MAKECAST");
JUT_ASSERT(0x2e3, name);
@@ -554,17 +587,28 @@ void dEvDtStaff_c::specialProcDirector() {
"PLAYER_DRAW",
"PLAYER_NODRAW",
};
enum {
ACT_WAIT,
ACT_NEXT,
ACT_FADE,
ACT_BGM_START,
ACT_VIBRATION,
ACT_SE_START,
ACT_WIPE,
ACT_PLAYER_DRAW,
ACT_PLAYER_NODRAW,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: // NEXT
case ACT_NEXT:
dEvDt_Next_Stage(staffIdx, 0);
break;
case 2: // FADE
case ACT_FADE:
{
f32* rate = dComIfGp_evmng_getMyFloatP(staffIdx, "Rate");
u32* color = dComIfGp_evmng_getMyIntegerP(staffIdx, "Color");
@@ -585,7 +629,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 3: // BGM_START
case ACT_BGM_START:
{
u32* pBGM = dComIfGp_evmng_getMyIntegerP(staffIdx, "BGM_ID");
u32 bgm;
@@ -604,7 +648,7 @@ void dEvDtStaff_c::specialProcDirector() {
mDoAud_bgmStart(bgm_table[bgm]);
}
break;
case 4: // VIBRATION
case ACT_VIBRATION:
{
specialProc_WaitStart(staffIdx);
if (mTimer == 0)
@@ -622,7 +666,7 @@ void dEvDtStaff_c::specialProcDirector() {
dComIfGp_getVibration().StartQuake(pattern, 0, *type, xyz);
}
break;
case 5: // SE_START
case ACT_SE_START:
{
s32* pSE = (s32*)dComIfGp_evmng_getMyIntegerP(staffIdx, "SENUM");
if (pSE != NULL) {
@@ -636,7 +680,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 6: // WIPE
case ACT_WIPE:
{
f32* rate = dComIfGp_evmng_getMyFloatP(staffIdx, "Rate");
JUT_ASSERT(0x384, rate);
@@ -655,22 +699,22 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 7: // PLAYER_DRAW
case ACT_PLAYER_DRAW:
player->offPlayerNoDraw();
break;
case 8: // PLAYER_NODRAW
case ACT_PLAYER_NODRAW:
player->onPlayerNoDraw();
break;
}
}
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitProc(staffIdx);
break;
case 1: // NEXT
case ACT_NEXT:
break;
case 2: // FADE
case ACT_FADE:
{
if (!mDoGph_gInf_c::isFade()) {
dComIfGp_evmng_cutEnd(staffIdx);
@@ -682,7 +726,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 4: // VIBRATION
case ACT_VIBRATION:
{
if (mTimer > 0) {
mTimer--;
@@ -693,7 +737,7 @@ void dEvDtStaff_c::specialProcDirector() {
}
}
break;
case 6: // WIPE
case ACT_WIPE:
{
if (mWipeDirection) {
if (dDlst_list_c::getWipeRate() == 0.0f)
@@ -723,15 +767,20 @@ void dEvDtStaff_c::specialProcPackage() {
"PLAY",
"PLAY2",
};
enum {
ACT_WAIT,
ACT_PLAY,
ACT_PLAY2,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitStart(staffIdx);
break;
case 1: // PLAY
case 2: // PLAY2
case ACT_PLAY:
case ACT_PLAY2:
{
const char* filename = dComIfGp_evmng_getMyStringP(staffIdx, "FileName");
cXyz* pOffsetPos = dComIfGp_evmng_getMyXyzP(staffIdx, "OffsetPos");
@@ -761,10 +810,10 @@ void dEvDtStaff_c::specialProcPackage() {
}
switch (actIdx) {
case 0: // WAIT
case ACT_WAIT:
specialProc_WaitProc(staffIdx);
break;
case 1: // PLAY
case ACT_PLAY:
{
if (mWipeDirection == 0) {
if (dComIfGp_demo_mode() == 2) {
@@ -800,24 +849,28 @@ void dEvDtStaff_c::specialProcTimekeeper() {
"COUNTDOWN",
"WAIT",
};
enum {
ACT_COUNTDOWN,
ACT_WAIT,
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // COUNTDOWN
case ACT_COUNTDOWN:
{
u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "Timer");
JUT_ASSERT(0x482, idata);
mTimer = *idata;
}
break;
case 1: // WAIT
case ACT_WAIT:
break;
}
}
switch (actIdx) {
case 0: // COUNTDOWN
case ACT_COUNTDOWN:
{
if (mTimer > 0)
mTimer--;
@@ -825,7 +878,7 @@ void dEvDtStaff_c::specialProcTimekeeper() {
dComIfGp_evmng_cutEnd(staffIdx);
}
break;
case 1: // WAIT
case ACT_WAIT:
dComIfGp_evmng_cutEnd(staffIdx);
break;
case -1: