mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

obj_mshokki OK on demo

Browse Source
This commit is contained in:
LagoLunatic
2025-08-07 20:24:32 -04:00
parent 299b6f4347
commit 6d2d5f9daa
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1416,7 +1416,7 @@ config.libs = [
ActorRel(Matching, "d_a_obj_lpalm"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_monument"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_movebox", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_mshokki", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_mshokki", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_ohatch"),
ActorRel(Matching, "d_a_obj_otble", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_pbco"),
src/d/actor/d_a_obj_mshokki.cpp
+6 -8
View File
@@ -206,16 +206,14 @@ void daObjMshokki_c::co_hitCallback(fopAc_ac_c* a_this, dCcD_GObjInf*, fopAc_ac_
if (fVar1 > 1.0f) {
fVar1 = 1.0f;
}
s16 angle_x = l_data[i_this->m60C].m0C * fVar1;
s16 angle_y = other_actor->current.angle.y;
i_this->shape_angle.x = angle_x;
i_this->shape_angle.y = angle_y;
#if VERSION == VERSION_DEMO
i_this->shape_angle.x = l_data[i_this->m60C].m0C * fVar1;
s32 sVar3 = other_actor->current.angle.y;
i_this->shape_angle.y = sVar3;
i_this->m61C = sVar3 + HIO(m18) * 2.0f;
i_this->m61C = angle_y + HIO(m18) * 2.0f;
#else
s16 sVar3 = other_actor->current.angle.y;
i_this->shape_angle.x = l_data[i_this->m60C].m0C * fVar1;
i_this->shape_angle.y = sVar3;
i_this->m61C = sVar3 + (s16)(HIO(m18) * 2.0f);
i_this->m61C = angle_y + (s16)(HIO(m18) * 2.0f);
#endif
}
}