diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-21 19:18:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-21 19:18:46 -0400 |
| commit | ab5659b2016b4040424198f2f33080e125182f21 (patch) | |
| tree | 5c0faf528ecf13a22347b3ccc1e9d939ed636282 /src/d/actor/d_a_goal_flag.cpp | |
| parent | d10eaa3ef8b258d5edc4eb8756280155ec342481 (diff) | |
d_a_player_main cleanup and some demo matches (#1016)
* d_a_player_main cleanup and some demo matches
* Add unions for player_main procvars
* Make d_a_player_main fields private
Diffstat (limited to 'src/d/actor/d_a_goal_flag.cpp')
| -rw-r--r-- | src/d/actor/d_a_goal_flag.cpp | 92 |
1 files changed, 45 insertions, 47 deletions
diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index a6613f29..ff77b1de 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -728,68 +728,66 @@ cXyz daGoal_Flag_c::get_cloth_anim_factor(cXyz* i_posArr, cXyz* i_nrmArr, cXyz* f32 dot = i_windVecP->getDotProduct(i_nrmArr[index]); if ((i_row == 0 || i_row == 4) && (i_col == 0 || i_col == 8)) { return cXyz::Zero; - } else { - cXyz anim_factor = i_nrmArr[index] * dot; - anim_factor.y += l_HIO.mFlagSagFactor * ((float)i_row * 0.25f); - if (i_col != 0) { + } + cXyz anim_factor = i_nrmArr[index] * dot; + anim_factor.y += l_HIO.mFlagSagFactor * ((float)i_row * 0.25f); + if (i_col != 0) { + get_cloth_anim_sub_factor( + &pos, &i_posArr[(i_col - 1) + (i_row * 9)], + &anim_factor, 250.0f); + if (i_row != 0) { get_cloth_anim_sub_factor( - &pos, &i_posArr[(i_col - 1) + (i_row * 9)], - &anim_factor, 250.0f); - if (i_row != 0) { - get_cloth_anim_sub_factor( - &pos, &i_posArr[i_col + (i_row - 1) * 9], - &anim_factor, 120.0f); - get_cloth_anim_sub_factor( - &pos, &i_posArr[(i_col - 1) + (i_row - 1) * 9], - &anim_factor, 277.3085f); - } - if (i_row != 4) { - get_cloth_anim_sub_factor( - &pos, &i_posArr[i_col + (i_row + 1) * 9], - &anim_factor, 120.0f); - get_cloth_anim_sub_factor( - &pos, &i_posArr[(i_col - 1) + (i_row + 1) * 9], - &anim_factor, 277.3085f); - } - if (i_col != 8) { - get_cloth_anim_sub_factor( - &pos, &i_posArr[(i_col + 1) + i_row * 9], - &anim_factor, 250.0f); - if (i_row != 0) { - get_cloth_anim_sub_factor( - &pos, &i_posArr[(i_col + 1) + (i_row - 1) * 9], - &anim_factor, 277.3085f); - } - if (i_row != 4) { - get_cloth_anim_sub_factor( - &pos, &i_posArr[(i_col + 1) + (i_row + 1) * 9], - &anim_factor, 277.3085f); - } - } - return anim_factor; - } else { + &pos, &i_posArr[i_col + (i_row - 1) * 9], + &anim_factor, 120.0f); + get_cloth_anim_sub_factor( + &pos, &i_posArr[(i_col - 1) + (i_row - 1) * 9], + &anim_factor, 277.3085f); + } + if (i_row != 4) { get_cloth_anim_sub_factor( - &pos, &i_posArr[(i_col + 1) + (i_row * 9)], + &pos, &i_posArr[i_col + (i_row + 1) * 9], + &anim_factor, 120.0f); + get_cloth_anim_sub_factor( + &pos, &i_posArr[(i_col - 1) + (i_row + 1) * 9], + &anim_factor, 277.3085f); + } + if (i_col != 8) { + get_cloth_anim_sub_factor( + &pos, &i_posArr[(i_col + 1) + i_row * 9], &anim_factor, 250.0f); if (i_row != 0) { get_cloth_anim_sub_factor( - &pos, &i_posArr[i_col + (i_row - 1) * 9], - &anim_factor, 120.0f); - get_cloth_anim_sub_factor( &pos, &i_posArr[(i_col + 1) + (i_row - 1) * 9], &anim_factor, 277.3085f); } if (i_row != 4) { get_cloth_anim_sub_factor( - &pos, &i_posArr[i_col + (i_row + 1) * 9], - &anim_factor, 120.0f); - get_cloth_anim_sub_factor( &pos, &i_posArr[(i_col + 1) + (i_row + 1) * 9], &anim_factor, 277.3085f); } - return anim_factor; } + return anim_factor; + } + get_cloth_anim_sub_factor( + &pos, &i_posArr[(i_col + 1) + (i_row * 9)], + &anim_factor, 250.0f); + if (i_row != 0) { + get_cloth_anim_sub_factor( + &pos, &i_posArr[i_col + (i_row - 1) * 9], + &anim_factor, 120.0f); + get_cloth_anim_sub_factor( + &pos, &i_posArr[(i_col + 1) + (i_row - 1) * 9], + &anim_factor, 277.3085f); + } + if (i_row != 4) { + get_cloth_anim_sub_factor( + &pos, &i_posArr[i_col + (i_row + 1) * 9], + &anim_factor, 120.0f); + get_cloth_anim_sub_factor( + &pos, &i_posArr[(i_col + 1) + (i_row + 1) * 9], + &anim_factor, 277.3085f); } + return anim_factor; } /* 00001CC0-00001CE0 .text checkCreateHeap__FP10fopAc_ac_c */ |