mirror of
https://github.com/zeldaret/tww.git
synced 2026-06-28 10:20:52 -04:00
Minor cleanup
This commit is contained in:
@@ -510,7 +510,7 @@ enum {
|
||||
/* 0x01F5 */ PROC_GAMEOVER,
|
||||
PROC_COUNT_e,
|
||||
|
||||
PROC_INVALID_e = 0x7FFF,
|
||||
PROC_INVALID_e = 0x7FFF,
|
||||
};
|
||||
|
||||
#endif /* D_PROCNAME_H */
|
||||
|
||||
@@ -265,7 +265,12 @@ static BOOL daBridge_Draw(bridge_class* i_this) {
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
pBr->mLineMat1.update(5, (GXColor){150, 150, 150, 255}, &i_this->actor.tevStr);
|
||||
#else
|
||||
GXColor color = (GXColor){150, 150, 150, 255};
|
||||
pBr->mLineMat1.update(5, color, &i_this->actor.tevStr);
|
||||
#endif
|
||||
dComIfGd_set3DlineMat(&pBr->mLineMat1);
|
||||
continue;
|
||||
}
|
||||
@@ -370,7 +375,12 @@ static BOOL daBridge_Draw(bridge_class* i_this) {
|
||||
tmp = 4.0f;
|
||||
}
|
||||
|
||||
i_this->mLineMat.update(i_this->m030C + 2, tmp, (GXColor){150, 150, 150, 255}, 0, &i_this->actor.tevStr);
|
||||
#ifdef __MWERKS__
|
||||
i_this->mLineMat.update(i_this->m030C + 2, tmp, (GXColor){150, 150, 150, 255}, 0, &i_this->actor.tevStr);
|
||||
#else
|
||||
GXColor color = (GXColor){150, 150, 150, 255};
|
||||
i_this->mLineMat.update(i_this->m030C + 2, tmp, color, 0, &i_this->actor.tevStr);
|
||||
#endif
|
||||
dComIfGd_set3DlineMat(&i_this->mLineMat);
|
||||
}
|
||||
|
||||
|
||||
@@ -68,13 +68,13 @@ bool daObjRcloud_c::create_heap() {
|
||||
|
||||
if (modelData == NULL || pAnm == FALSE) {
|
||||
JUT_ASSERT(DEMO_SELECT(216, 220), FALSE);
|
||||
result = 0;
|
||||
result = false;
|
||||
} else {
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
|
||||
s32 btkRet = mBtkAnm.init(modelData, pAnm, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1.0f, FALSE, 0);
|
||||
|
||||
if (mpModel == NULL || btkRet == 0) {
|
||||
result = 0;
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -292,6 +292,7 @@ void Act_c::get_base_model_light_start_offset(cXyz* outPos) {
|
||||
|
||||
/* 00000BCC-0000111C .text get_projection_info__Q210daTagLight5Act_cFP4cXyzP4cXyzP4cXyzPC4cXyzPC4cXyz */
|
||||
void Act_c::get_projection_info(cXyz* outArg1, cXyz* outArg2, cXyz* outArg3, const cXyz* arg4, const cXyz* arg5) {
|
||||
/* Nonmatching - stack order */
|
||||
*outArg3 = current.pos;
|
||||
|
||||
f32 ratio = prm_get_coneRatio();
|
||||
@@ -510,6 +511,7 @@ void Act_c::set_material(J3DMaterial* material, unsigned char alpha) {
|
||||
|
||||
/* 00001D20-00001EAC .text _draw__Q210daTagLight5Act_cFv */
|
||||
bool Act_c::_draw() {
|
||||
/* Nonmatching - regalloc */
|
||||
if (m2A0 == 1 && m308 > 0.0f) {
|
||||
g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType(mpModel, &tevStr);
|
||||
|
||||
Reference in New Issue
Block a user