mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-13 03:29:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup of f_pc/f_op files (#2254)

Browse Source 
* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
This commit is contained in:
TakaRikka
2024-11-29 08:24:26 -08:00
committed by GitHub
parent 6482fe7535
commit 073992df8d
903 changed files with 6835 additions and 6587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_k_wpillar.cpp
+15 -15
View File
@@ -17,7 +17,7 @@ int dkWpillar_c::create() {
int roomNo;
u8 envrOverride;
if (fopAcM_gc_c::gndCheck(&mPos)) {
if (fopAcM_gc_c::gndCheck(&pos)) {
roomNo = fopAcM_gc_c::getRoomId();
envrOverride = fopAcM_gc_c::getPolyColor();
} else {
@@ -26,16 +26,16 @@ int dkWpillar_c::create() {
}
dKy_tevstr_init(&mTevstr, roomNo, envrOverride);
g_env_light.settingTevStruct(0x10, &mPos, &mTevstr);
g_env_light.settingTevStruct(0x10, &pos, &mTevstr);
dComIfGp_particle_set(0x1BD, &mPos, &mTevstr, NULL, &mScale, 255, NULL, roomNo, NULL, NULL,
dComIfGp_particle_set(0x1BD, &pos, &mTevstr, NULL, &scale, 255, NULL, roomNo, NULL, NULL,
NULL);
if ((int)mParam != 3) {
dComIfGp_particle_set(0x1BE, &mPos, &mTevstr, NULL, &mScale, 255, NULL, roomNo, NULL, NULL,
if ((int)parameters != 3) {
dComIfGp_particle_set(0x1BE, &pos, &mTevstr, NULL, &scale, 255, NULL, roomNo, NULL, NULL,
NULL);
}
if ((int)mParam == 1) {
if ((int)parameters == 1) {
return cPhs_ERROR_e;
}
@@ -69,12 +69,12 @@ int dkWpillar_c::create() {
return cPhs_ERROR_e;
}
if ((int)mParam == 2) {
mScale.set(0.5f, 0.25f, 0.5f);
if ((int)parameters == 2) {
scale.set(0.5f, 0.25f, 0.5f);
}
mpModel->setBaseScale(mScale);
mDoMtx_stack_c::transS(mPos.x, mPos.y, mPos.z);
mpModel->setBaseScale(scale);
mDoMtx_stack_c::transS(pos.x, pos.y, pos.z);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
return cPhs_COMPLEATE_e;
}
@@ -107,9 +107,9 @@ int dkWpillar_c::execute() {
fopKyM_Delete(this);
} else {
f32 sp8;
if (fopAcM_getWaterY(&mPos, &sp8) != 0) {
if (fopAcM_getWaterY(&pos, &sp8) != 0) {
mpModel->getBaseTRMtx()[1][3] = sp8;
mPos.y = sp8;
pos.y = sp8;
}
}
@@ -124,7 +124,7 @@ static int dkWpillar_Execute(dkWpillar_c* i_this) {
/* 802620C8-802621AC 25CA08 00E4+00 1/1 0/0 0/0 .text draw__11dkWpillar_cFv */
int dkWpillar_c::draw() {
g_env_light.settingTevStruct(0x10, &mPos, &mTevstr);
g_env_light.settingTevStruct(0x10, &pos, &mTevstr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevstr);
dComIfGd_setListIndScreen();
@@ -155,11 +155,11 @@ extern kankyo_process_profile_definition g_profile_WPILLAR = {
9,
fpcPi_CURRENT_e,
PROC_WPILLAR,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(dkWpillar_c),
0,
0,
&g_fopKy_Method,
759,
&l_dkWpillar_Method,
};
};