]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/bot/waypoints.qc
Merge master
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / waypoints.qc
index 33ff6b39b2e7a8290024b4d2a76a57d74c96a2b1..4db72e407da5676ad73a15eab5a3c170a1aafd67 100644 (file)
@@ -3,7 +3,7 @@
 // (suitable for spawnfunc_waypoint editor)
 entity waypoint_spawn(vector m1, vector m2, float f)
 {
-       local entity w;
+       entity w;
        w = find(world, classname, "waypoint");
 
        if not(f & WAYPOINTFLAG_PERSONAL)
@@ -67,12 +67,12 @@ entity waypoint_spawn(vector m1, vector m2, float f)
                w.model = "";
 
        return w;
-};
+}
 
 // add a new link to the spawnfunc_waypoint, replacing the furthest link it already has
 void waypoint_addlink(entity from, entity to)
 {
-       local float c;
+       float c;
 
        if (from == to)
                return;
@@ -92,7 +92,7 @@ void waypoint_addlink(entity from, entity to)
        {
                // if either is a box we have to find the nearest points on them to
                // calculate the distance properly
-               local vector v1, v2, m1, m2;
+               vector v1, v2, m1, m2;
                v1 = from.origin;
                m1 = to.absmin;
                m2 = to.absmax;
@@ -144,15 +144,15 @@ void waypoint_addlink(entity from, entity to)
        if (from.wp01mincost < c) {from.wp02 = to;from.wp02mincost = c;return;} from.wp02 = from.wp01;from.wp02mincost = from.wp01mincost;
        if (from.wp00mincost < c) {from.wp01 = to;from.wp01mincost = c;return;} from.wp01 = from.wp00;from.wp01mincost = from.wp00mincost;
        from.wp00 = to;from.wp00mincost = c;return;
-};
+}
 
 // relink this spawnfunc_waypoint
 // (precompile a list of all reachable waypoints from this spawnfunc_waypoint)
 // (SLOW!)
 void waypoint_think()
 {
-       local entity e;
-       local vector sv, sm1, sm2, ev, em1, em2, dv;
+       entity e;
+       vector sv, sm1, sm2, ev, em1, em2, dv;
 
        bot_calculate_stepheightvec();
 
@@ -226,12 +226,12 @@ void waypoint_think()
        }
        navigation_testtracewalk = 0;
        self.wplinked = TRUE;
-};
+}
 
 void waypoint_clearlinks(entity wp)
 {
        // clear links to other waypoints
-       local float f;
+       float f;
        f = 10000000;
        wp.wp00 = wp.wp01 = wp.wp02 = wp.wp03 = wp.wp04 = wp.wp05 = wp.wp06 = wp.wp07 = world;
        wp.wp08 = wp.wp09 = wp.wp10 = wp.wp11 = wp.wp12 = wp.wp13 = wp.wp14 = wp.wp15 = world;
@@ -244,7 +244,7 @@ void waypoint_clearlinks(entity wp)
        wp.wp24mincost = wp.wp25mincost = wp.wp26mincost = wp.wp27mincost = wp.wp28mincost = wp.wp29mincost = wp.wp30mincost = wp.wp31mincost = f;
 
        wp.wplinked = FALSE;
-};
+}
 
 // tell a spawnfunc_waypoint to relink
 void waypoint_schedulerelink(entity wp)
@@ -254,7 +254,7 @@ void waypoint_schedulerelink(entity wp)
        // TODO: add some sort of visible box in edit mode for box waypoints
        if (autocvar_g_waypointeditor)
        {
-               local vector m1, m2;
+               vector m1, m2;
                m1 = wp.mins;
                m2 = wp.maxs;
                setmodel(wp, "models/runematch/rune.mdl"); wp.effects = EF_LOWPRECISION;
@@ -287,7 +287,7 @@ void spawnfunc_waypoint()
        // schedule a relink after other waypoints have had a chance to spawn
        waypoint_clearlinks(self);
        //waypoint_schedulerelink(self);
-};
+}
 
 // remove a spawnfunc_waypoint, and schedule all neighbors to relink
 void waypoint_remove(entity e)
@@ -327,12 +327,12 @@ void waypoint_remove(entity e)
        waypoint_schedulerelink(e.wp31);
        // and now remove the spawnfunc_waypoint
        remove(e);
-};
+}
 
 // empties the map of waypoints
 void waypoint_removeall()
 {
-       local entity head, next;
+       entity head, next;
        head = findchain(classname, "waypoint");
        while (head)
        {
@@ -340,13 +340,13 @@ void waypoint_removeall()
                remove(head);
                head = next;
        }
-};
+}
 
 // tell all waypoints to relink
 // (is this useful at all?)
 void waypoint_schedulerelinkall()
 {
-       local entity head;
+       entity head;
        relink_total = relink_walkculled = relink_pvsculled = relink_lengthculled = 0;
        head = findchain(classname, "waypoint");
        while (head)
@@ -354,15 +354,15 @@ void waypoint_schedulerelinkall()
                waypoint_schedulerelink(head);
                head = head.chain;
        }
-};
+}
 
 // Load waypoint links from file
 float waypoint_load_links()
 {
-       local string filename, s;
-       local float file, tokens, c, found;
-       local entity wp_from, wp_to;
-       local vector wp_to_pos, wp_from_pos;
+       string filename, s;
+       float file, tokens, c, found;
+       entity wp_from, wp_to;
+       vector wp_to_pos, wp_from_pos;
        filename = strcat("maps/", mapname);
        filename = strcat(filename, ".waypoints.cache");
        file = fopen(filename, FILE_READ);
@@ -451,14 +451,14 @@ float waypoint_load_links()
 
        botframe_cachedwaypointlinks = TRUE;
        return TRUE;
-};
+}
 
 void waypoint_load_links_hardwired()
 {
-       local string filename, s;
-       local float file, tokens, c, found;
-       local entity wp_from, wp_to;
-       local vector wp_to_pos, wp_from_pos;
+       string filename, s;
+       float file, tokens, c, found;
+       entity wp_from, wp_to;
+       vector wp_to_pos, wp_from_pos;
        filename = strcat("maps/", mapname);
        filename = strcat(filename, ".waypoints.hardwired");
        file = fopen(filename, FILE_READ);
@@ -549,14 +549,14 @@ void waypoint_load_links_hardwired()
        dprint(" waypoint links from maps/");
        dprint(mapname);
        dprint(".waypoints.hardwired\n");
-};
+}
 
 // Save all waypoint links to a file
 void waypoint_save_links()
 {
-       local string filename, s;
-       local float file, c, i;
-       local entity w, link;
+       string filename, s;
+       float file, c, i;
+       entity w, link;
        filename = strcat("maps/", mapname);
        filename = strcat(filename, ".waypoints.cache");
        file = fopen(filename, FILE_WRITE);
@@ -627,14 +627,14 @@ void waypoint_save_links()
        print(" waypoints links to maps/");
        print(mapname);
        print(".waypoints.cache\n");
-};
+}
 
 // save waypoints to gamedir/data/maps/mapname.waypoints
 void waypoint_saveall()
 {
-       local string filename, s;
-       local float file, c;
-       local entity w;
+       string filename, s;
+       float file, c;
+       entity w;
        filename = strcat("maps/", mapname);
        filename = strcat(filename, ".waypoints");
        file = fopen(filename, FILE_WRITE);
@@ -671,14 +671,14 @@ void waypoint_saveall()
        }
        waypoint_save_links();
        botframe_loadedforcedlinks = FALSE;
-};
+}
 
 // load waypoints from file
 float waypoint_loadall()
 {
-       local string filename, s;
-       local float file, cwp, cwb, fl;
-       local vector m1, m2;
+       string filename, s;
+       float file, cwp, cwb, fl;
+       vector m1, m2;
        cwp = 0;
        cwb = 0;
        filename = strcat("maps/", mapname);
@@ -722,7 +722,7 @@ float waypoint_loadall()
                dprint(" failed\n");
        }
        return cwp + cwb;
-};
+}
 
 vector waypoint_fixorigin(vector position)
 {
@@ -736,7 +736,7 @@ vector waypoint_fixorigin(vector position)
 
 void waypoint_spawnforitem_force(entity e, vector org)
 {
-       local entity w;
+       entity w;
 
        // Fix the waypoint altitude if necessary
        org = waypoint_fixorigin(org);
@@ -772,12 +772,12 @@ void waypoint_spawnforitem(entity e)
                return;
 
        waypoint_spawnforitem_force(e, e.origin);
-};
+}
 
 void waypoint_spawnforteleporter_boxes(entity e, vector org1, vector org2, vector destination1, vector destination2, float timetaken)
 {
-       local entity w;
-       local entity dw;
+       entity w;
+       entity dw;
        w = waypoint_spawn(org1, org2, WAYPOINTFLAG_GENERATED | WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_NORELINK);
        dw = waypoint_spawn(destination1, destination2, WAYPOINTFLAG_GENERATED);
        // one way link to the destination
@@ -787,20 +787,20 @@ void waypoint_spawnforteleporter_boxes(entity e, vector org1, vector org2, vecto
        // (teleporters are not goals, so this is probably useless)
        e.nearestwaypoint = w;
        e.nearestwaypointtimeout = time + 1000000000;
-};
+}
 
 void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken)
 {
        org = waypoint_fixorigin(org);
        destination = waypoint_fixorigin(destination);
        waypoint_spawnforteleporter_boxes(e, org, org, destination, destination, timetaken);
-};
+}
 
 void waypoint_spawnforteleporter(entity e, vector destination, float timetaken)
 {
        destination = waypoint_fixorigin(destination);
        waypoint_spawnforteleporter_boxes(e, e.absmin, e.absmax, destination, destination, timetaken);
-};
+}
 
 entity waypoint_spawnpersonal(vector position)
 {
@@ -819,11 +819,11 @@ entity waypoint_spawnpersonal(vector position)
        waypoint_schedulerelink(w);
 
        return w;
-};
+}
 
 void botframe_showwaypointlinks()
 {
-       local entity player, head, w;
+       entity player, head, w;
        if (time < botframe_waypointeditorlightningtime)
                return;
        botframe_waypointeditorlightningtime = time + 0.5;
@@ -876,7 +876,7 @@ void botframe_showwaypointlinks()
                }
                player = find(player, classname, "player");
        }
-};
+}
 
 float botframe_autowaypoints_fixdown(vector v)
 {
@@ -1063,6 +1063,7 @@ void botframe_autowaypoints_fix(entity p, float walkfromwp, .entity fld)
                return; // shouldn't happen, caught above
        botframe_autowaypoints_createwp(trace_endpos, p, fld);
 }
+
 void botframe_autowaypoints()
 {
        entity p;
@@ -1077,3 +1078,4 @@ void botframe_autowaypoints()
                //te_explosion(p.botframe_autowaypoints_lastwp0.origin);
        }
 }
+