d_a_door_shutter OK (#2142)

* a_d_door_shutter OK

* d_a_door_spiral OK
This commit is contained in:
hatal175
2024-05-01 03:08:21 +03:00
committed by GitHub
parent 025870a64c
commit 9995df3bc7
105 changed files with 2237 additions and 8682 deletions
+5 -5
View File
@@ -7,7 +7,7 @@
#include "f_op/f_op_actor_mng.h"
/* 8003A188-8003A194 034AC8 000C+00 0/0 0/0 17/17 .text getKind__13door_param2_cFP10fopAc_ac_c */
u32 door_param2_c::getKind(fopAc_ac_c* i_actor) {
int door_param2_c::getKind(fopAc_ac_c* i_actor) {
return fopAcM_GetParamBit(i_actor, 0, 5);
}
@@ -31,13 +31,13 @@ u8 door_param2_c::getBackOption(fopAc_ac_c* i_actor) {
/* 8003A1B8-8003A1C4 034AF8 000C+00 0/0 0/0 19/19 .text getFRoomNo__13door_param2_cFP10fopAc_ac_c
*/
u32 door_param2_c::getFRoomNo(fopAc_ac_c* i_actor) {
u8 door_param2_c::getFRoomNo(fopAc_ac_c* i_actor) {
return fopAcM_GetParamBit(i_actor, 13, 6);
}
/* 8003A1C4-8003A1D0 034B04 000C+00 0/0 0/0 10/10 .text getBRoomNo__13door_param2_cFP10fopAc_ac_c
*/
u32 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) {
u8 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) {
return fopAcM_GetParamBit(i_actor, 19, 6);
}
@@ -58,7 +58,7 @@ u8 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) {
}
/* 8003A1F4-8003A200 034B34 000C+00 0/0 0/0 4/4 .text isMsgDoor__13door_param2_cFP10fopAc_ac_c */
u32 door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) {
int door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) {
return fopAcM_GetParamBit(i_actor, 31, 1);
}
@@ -69,7 +69,7 @@ u8 door_param2_c::getEventNo(fopAc_ac_c* i_actor) {
/* 8003A20C-8003A218 034B4C 000C+00 0/0 0/0 2/2 .text getEventNo2__13door_param2_cFP10fopAc_ac_c
*/
u32 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) {
u8 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) {
return (i_actor->home.angle.x >> 8) & 0xFF;
}
+1 -1
View File
@@ -4264,7 +4264,7 @@ void dScnKy_env_light_c::settingTevStruct(int i_tevstrType, cXyz* param_1, dKy_t
if (i_tevstr->field_0x37a != 20) {
i_tevstr->field_0x374 = g_env_light.mPaletteTerrainLightEffect;
} else {
switch (i_tevstr->field_0x364) {
switch (i_tevstr->mLightInf) {
case 0:
i_tevstr->field_0x374 = 0.2f;
break;
+1 -1
View File
@@ -1172,7 +1172,7 @@ bool dPa_modelEcallBack::model_c::set(J3DModelData* param_0, dKy_tevstr_c const&
*(Arr*)&field_0x8.mColorK0 = *(Arr*)&param_1.mColorK0;
*(Arr*)&field_0x8.mFogColor = *(Arr*)&param_1.mFogColor;
*(int*)&field_0x8.field_0x360 = *(int*)&param_1.field_0x360;
*(int*)&field_0x8.field_0x364 = *(int*)&param_1.field_0x364;
*(int*)&field_0x8.mLightInf = *(int*)&param_1.mLightInf;
field_0x8.mFogStartZ = param_1.mFogStartZ;
field_0x8.mFogEndZ = param_1.mFogEndZ;