From 87669c0716e955c0392d631770837a491b2bf459 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 14 Jun 2018 13:03:36 +0200 Subject: [PATCH] Split havocbot_symmetryaxis_equation vector into separate floats --- qcsrc/common/gamemodes/gamemode/ctf/ctf.qc | 10 +++++----- qcsrc/server/bot/api.qh | 4 +++- qcsrc/server/bot/default/waypoints.qc | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc index 9382c9d8d7..c7ade84855 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc @@ -1377,7 +1377,8 @@ void havocbot_ctf_calculate_middlepoint() havocbot_middlepoint = s / n; havocbot_middlepoint_radius = vlen(fo - havocbot_middlepoint); - havocbot_symmetryaxis_equation = '0 0 0'; + havocbot_symmetry_axis_m = 0; + havocbot_symmetry_axis_q = 0; if(n == 2) { // for symmetrical editing of waypoints @@ -1385,11 +1386,10 @@ void havocbot_ctf_calculate_middlepoint() entity f2 = f1.ctf_worldflagnext; float m = -(f1.origin.y - f2.origin.y) / (f1.origin.x - f2.origin.x); float q = havocbot_middlepoint.y - m * havocbot_middlepoint.x; - havocbot_symmetryaxis_equation.x = m; - havocbot_symmetryaxis_equation.y = q; + havocbot_symmetry_axis_m = m; + havocbot_symmetry_axis_q = q; } - // store number of flags in this otherwise unused vector component - havocbot_symmetryaxis_equation.z = n; + havocbot_symmetry_origin_order = n; } diff --git a/qcsrc/server/bot/api.qh b/qcsrc/server/bot/api.qh index 51ac148fc1..0ecd7b8772 100644 --- a/qcsrc/server/bot/api.qh +++ b/qcsrc/server/bot/api.qh @@ -79,7 +79,9 @@ bool havocbot_goalrating_item_pickable_check_players(entity this, vector org, en vector havocbot_middlepoint; float havocbot_middlepoint_radius; -vector havocbot_symmetryaxis_equation; +float havocbot_symmetry_axis_m; +float havocbot_symmetry_axis_q; +float havocbot_symmetry_origin_order; .float goalentity_lock_timeout; .float ignoregoaltime; diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index b673ecf8c1..dfa3ada522 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -141,8 +141,8 @@ vector waypoint_getSymmetricalOrigin(vector org, int ctf_flags) } else if (fabs(autocvar_g_waypointeditor_symmetrical) == 2) { - float m = havocbot_symmetryaxis_equation.x; - float q = havocbot_symmetryaxis_equation.y; + float m = havocbot_symmetry_axis_m; + float q = havocbot_symmetry_axis_q; if (autocvar_g_waypointeditor_symmetrical == -2) { m = autocvar_g_waypointeditor_symmetrical_axis.x; @@ -246,7 +246,7 @@ void waypoint_spawn_fromeditor(entity pl) { entity e; vector org = pl.origin; - int ctf_flags = havocbot_symmetryaxis_equation.z; + int ctf_flags = havocbot_symmetry_origin_order; bool sym = ((autocvar_g_waypointeditor_symmetrical > 0 && ctf_flags >= 2) || (autocvar_g_waypointeditor_symmetrical < 0)); int order = ctf_flags; @@ -309,7 +309,7 @@ void waypoint_remove_fromeditor(entity pl) { entity e = navigation_findnearestwaypoint(pl, false); - int ctf_flags = havocbot_symmetryaxis_equation.z; + int ctf_flags = havocbot_symmetry_origin_order; bool sym = ((autocvar_g_waypointeditor_symmetrical > 0 && ctf_flags >= 2) || (autocvar_g_waypointeditor_symmetrical < 0)); int order = ctf_flags; -- 2.39.2