From 91e7d2960ed4b81753ff1f234ca88074cc6c7d32 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 3 Apr 2018 03:20:08 +0000 Subject: [PATCH] Switch do_silly_animation robot angle to reference clang warns for taking the address of unaligned data, but not for taking a reference to it. It should warn for both. The data should be fixed not to be unaligned, but for now, this change will quiet the warning. --- similar/main/ai.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index 2629429fb..04ad5b59b 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -792,7 +792,7 @@ static int do_silly_animation(object &objp) range_for (auto &jr, ras) { unsigned jointnum = jr.jointnum; - const vms_angvec *jp = &jr.angles; + auto &jp = jr.angles; vms_angvec *pobjp = &pobj_info->anim_angles[jointnum]; if (jointnum >= Polygon_models[objp.rtype.pobj_info.model_num].n_models) { @@ -801,9 +801,9 @@ static int do_silly_animation(object &objp) } auto &goal_angles = ail.goal_angles[jointnum]; auto &delta_angles = ail.delta_angles[jointnum]; - const auto animate_p = silly_animation_angle(&vms_angvec::p, *jp, *pobjp, flinch_attack_scale, goal_angles, delta_angles); - const auto animate_b = silly_animation_angle(&vms_angvec::b, *jp, *pobjp, flinch_attack_scale, goal_angles, delta_angles); - const auto animate_h = silly_animation_angle(&vms_angvec::h, *jp, *pobjp, flinch_attack_scale, goal_angles, delta_angles); + const auto animate_p = silly_animation_angle(&vms_angvec::p, jp, *pobjp, flinch_attack_scale, goal_angles, delta_angles); + const auto animate_b = silly_animation_angle(&vms_angvec::b, jp, *pobjp, flinch_attack_scale, goal_angles, delta_angles); + const auto animate_h = silly_animation_angle(&vms_angvec::h, jp, *pobjp, flinch_attack_scale, goal_angles, delta_angles); if (gun_num == 0) { if (animate_p || animate_b || animate_h)