mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 13:45:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Warning/error cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-10-18 15:55:31 -04:00
parent 0255c90ad6
commit ce592831fe
13 changed files with 125 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_eskban.cpp
+14 -8
View File
@@ -215,9 +215,11 @@ void daObjEskban::Act_c::eff_m_break(u16 particleID, u16 prm_b) {
J3DAnmTexPattern* txPattern =
static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI));
JPABaseEmitter* pBEmtr =
dComIfGp_particle_set(particleID, &this->current.pos, &this->shape_angle, NULL, 0xff, NULL,
-1, NULL, NULL, &cXyz(3, 3, 3));
cXyz scale(3.0f, 3.0f, 3.0f);
JPABaseEmitter* pBEmtr = dComIfGp_particle_set(
particleID, &this->current.pos, &this->shape_angle, NULL,
0xff, NULL, -1, NULL, NULL, &scale
);
if (!pBEmtr) {
return;
}
@@ -237,9 +239,11 @@ void daObjEskban::Act_c::eff_b_break(u16 particleID) {
c0.b = tevStr.mColorC0.b;
c0.a = tevStr.mColorC0.a;
JPABaseEmitter* pBEmtr =
dComIfGp_particle_set(particleID, &this->current.pos, NULL, NULL, 0xff, NULL, -1,
&tevStr.mColorK0, &c0, &cXyz(1, 1, 1));
cXyz scale(1.0f, 1.0f, 1.0f);
JPABaseEmitter* pBEmtr = dComIfGp_particle_set(
particleID, &this->current.pos, NULL, NULL,
0xff, NULL, -1, &tevStr.mColorK0, &c0, &scale
);
if (!pBEmtr) {
return;
}
@@ -293,7 +297,7 @@ int daObjEskban::Act_c::Execute(Mtx** pMtx) {
}
}
switch (mActorState) {
case ST_WAIT: /* 0x148 */
case ST_WAIT: /* 0x148 */ {
if (!mCameraCyl.ChkCoHit()) {
break;
}
@@ -309,6 +313,7 @@ int daObjEskban::Act_c::Execute(Mtx** pMtx) {
mActorState = ST_DESTROYED;
}
break;
}
case ST_DESTROYED: /* 0x1d8 */
if (eventInfo.checkCommandDemoAccrpt()) {
mActorState = ST_CUTSCENING;
@@ -316,7 +321,7 @@ int daObjEskban::Act_c::Execute(Mtx** pMtx) {
}
fopAcM_orderOtherEvent(this, "Eskban");
break;
case ST_CUTSCENING: /* 0x214 */
case ST_CUTSCENING: /* 0x214 */ {
if (fopAcM_SearchByID(mActorID) == NULL) {
mActorState = ST_SMOKING;
mRemainingSmokeAnm = DESTROY_SMOKE_ANM_LEN;
@@ -335,6 +340,7 @@ int daObjEskban::Act_c::Execute(Mtx** pMtx) {
mDoAud_seStart(JA_SE_READ_RIDDLE_1);
daObjEskban_effect_set();
break;
}
case ST_SMOKING: /* 0x350 */
if (mRemainingSmokeAnm > 0) {
mRemainingSmokeAnm--;