Move some waypoint code from impulse.qc to waypoints.qc

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / impulse.qc

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index 35134798c8018399fc2ed5057cce33fe4ca24af2..8bc28e3dc69943d2247b5c7ebb91f80842f165f5 100644 (file)
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -571,114 +571,16 @@ IMPULSE(waypoint_clear)
        sprint(this, "all waypoints cleared\n");
 }
 
-vector waypoint_getSymmetricalOrigin(vector org, int ctf_flags)
-{
-       vector new_org = org;
-       if (fabs(autocvar_g_waypointeditor_symmetrical) == 1)
-       {
-               vector map_center = havocbot_middlepoint;
-               if (autocvar_g_waypointeditor_symmetrical == -1)
-                       map_center = autocvar_g_waypointeditor_symmetrical_origin;
-
-               new_org = Rotate(org - map_center, 360 * DEG2RAD / ctf_flags) + map_center;
-       }
-       else if (fabs(autocvar_g_waypointeditor_symmetrical) == 2)
-       {
-               float m = havocbot_symmetryaxis_equation.x;
-               float q = havocbot_symmetryaxis_equation.y;
-               if (autocvar_g_waypointeditor_symmetrical == -2)
-               {
-                       m = autocvar_g_waypointeditor_symmetrical_axis.x;
-                       q = autocvar_g_waypointeditor_symmetrical_axis.y;
-               }
-
-               new_org.x = (1 / (1 + m*m)) * ((1 - m*m) * org.x + 2 * m * org.y - 2 * m * q);
-               new_org.y = (1 / (1 + m*m)) * (2 * m * org.x + (m*m - 1) * org.y + 2 * q);
-       }
-       new_org.z = org.z;
-       return new_org;
-}
-
 IMPULSE(navwaypoint_spawn)
 {
        if (!autocvar_g_waypointeditor) return;
-       entity e;
-       vector org = this.origin;
-       int ctf_flags = havocbot_symmetryaxis_equation.z;
-       bool sym = ((autocvar_g_waypointeditor_symmetrical > 0 && ctf_flags >= 2)
-                  || (autocvar_g_waypointeditor_symmetrical < 0));
-       int order = ctf_flags;
-       if(autocvar_g_waypointeditor_symmetrical_order >= 2)
-       {
-               order = autocvar_g_waypointeditor_symmetrical_order;
-               ctf_flags = order;
-       }
-
-       LABEL(add_wp);
-       e = waypoint_spawn(org, org, 0);
-       waypoint_schedulerelink(e);
-       bprint(strcat("Waypoint spawned at ", vtos(org), "\n"));
-       if(sym)
-       {
-               org = waypoint_getSymmetricalOrigin(e.origin, ctf_flags);
-               if (vdist(org - this.origin, >, 32))
-               {
-                       if(order > 2)
-                               order--;
-                       else
-                               sym = false;
-                       goto add_wp;
-               }
-       }
+       waypoint_spawn_fromeditor(this);
 }
 
 IMPULSE(navwaypoint_remove)
 {
        if (!autocvar_g_waypointeditor) return;
-       entity e = navigation_findnearestwaypoint(this, false);
-       int ctf_flags = havocbot_symmetryaxis_equation.z;
-       bool sym = ((autocvar_g_waypointeditor_symmetrical > 0 && ctf_flags >= 2)
-                  || (autocvar_g_waypointeditor_symmetrical < 0));
-       int order = ctf_flags;
-       if(autocvar_g_waypointeditor_symmetrical_order >= 2)
-       {
-               order = autocvar_g_waypointeditor_symmetrical_order;
-               ctf_flags = order;
-       }
-
-       LABEL(remove_wp);
-       if (!e) return;
-       if (e.wpflags & WAYPOINTFLAG_GENERATED) return;
-
-       if (e.wphardwired)
-       {
-               LOG_INFO("^1Warning: ^7Removal of hardwired waypoints is not allowed in the editor. Please remove links from/to this waypoint (", vtos(e.origin), ") by hand from maps/", mapname, ".waypoints.hardwired\n");
-               return;
-       }
-
-       entity wp_sym = NULL;
-       if (sym)
-       {
-               vector org = waypoint_getSymmetricalOrigin(e.origin, ctf_flags);
-               FOREACH_ENTITY_CLASS("waypoint", !(it.wpflags & WAYPOINTFLAG_GENERATED), {
-                       if(vdist(org - it.origin, <, 3))
-                       {
-                               wp_sym = it;
-                               break;
-                       }
-               });
-       }
-       bprint(strcat("Waypoint removed at ", vtos(e.origin), "\n"));
-       waypoint_remove(e);
-       if (sym && wp_sym)
-       {
-               e = wp_sym;
-               if(order > 2)
-                       order--;
-               else
-                       sym = false;
-               goto remove_wp;
-       }
+       waypoint_remove_fromeditor(this);
 }
 
 IMPULSE(navwaypoint_relink)