Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-08 14:48:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Several fixes

Browse Source
This commit is contained in:
korenkonder
2024-04-08 04:35:24 +03:00
parent e6c7555645
commit 7b6d64a609
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/rob/ex_block.cpp
+3 -2
View File
@@ -3821,7 +3821,7 @@ static void sub_14047D620(RobOsage* rob_osg, float_t step) {
vec3 v7 = nodes.data()[0].trans;
OsageCollision::Work* coli = rob_osg->coli;
OsageCollision::Work* coli_ring = rob_osg->coli_ring;
int32_t coli_type = rob_osg->skin_param_ptr->coli_type;
SkinParam::RootCollisionType coli_type = rob_osg->skin_param_ptr->coli_type;
RobOsageNode* i_begin = nodes.data() + 1;
RobOsageNode* i_end = nodes.data() + nodes.size();
for (RobOsageNode* i = i_begin; i != i_end; i++) {
@@ -3834,7 +3834,8 @@ static void sub_14047D620(RobOsage* rob_osg, float_t step) {
j->field_C8 += v17;
}
if (coli_type && (coli_type != SkinParam::RootCollisionTypeBall || i != i_begin)) {
if (coli_type != SkinParam::RootCollisionTypeEnd
&& (coli_type != SkinParam::RootCollisionTypeBall || i != i_begin)) {
float_t v20 = (float_t)(
OsageCollision::osage_capsule_cls(coli_ring, i[0].trans, i[-1].trans, data->skp_osg_node.coli_r)
+ OsageCollision::osage_capsule_cls(coli, i[0].trans, i[-1].trans, data->skp_osg_node.coli_r));