X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fpathlib%2Fmain.qc;h=4a5c2c1754e1399fad624f9e3704af06331dd623;hb=3cbcea63497633f206816900e4f7e32b833751f0;hp=833ad9b3f33bba542bc8cafbfdd2598f14fd79ad;hpb=f134a25da56d9f4c3452cbd47a7ee97d795fc759;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc
index 833ad9b3f..4a5c2c175 100644
--- a/qcsrc/server/pathlib/main.qc
+++ b/qcsrc/server/pathlib/main.qc
@@ -1,11 +1,17 @@
 #include "main.qh"
 
-#include "pathlib.qh"
-#include "utility.qh"
-#include "../command/common.qh"
+#include <common/stats.qh>
+#include <common/turrets/util.qh>
+#include <common/weapons/_all.qh>
+#include <server/command/common.qh>
+#include <server/pathlib/pathlib.qh>
+#include <server/pathlib/utility.qh>
 
 void pathlib_deletepath(entity start)
 {
+    if(!start)
+        return;
+
     FOREACH_ENTITY_ENT(owner, start,
     {
         setthink(it, SUB_Remove);
@@ -17,15 +23,15 @@ const float PATHLIB_NODEEXPIRE = 20; // 0.05
 
 void dumpnode(entity n)
 {
+    if(n.is_path_node)
+        IL_REMOVE(g_pathlib_nodes, n);
     n.is_path_node = false;
     setthink(n, SUB_Remove);
     n.nextthink    = time;
 }
 
 #if DEBUGPATHING
-void pathlib_showpath(entity start);
-void pathlib_showpath2(entity path);
-void pathlib_showsquare(vector where,float goodsquare,float _lifetime);
+#include "debug.qh"
 #endif
 
 
@@ -44,6 +50,7 @@ entity pathlib_mknode(vector where,entity parent)
 
     setthink(node, SUB_Remove);
     node.nextthink    = time + PATHLIB_NODEEXPIRE;
+    IL_PUSH(g_pathlib_nodes, node);
     node.is_path_node = true;
     node.owner        = openlist;
     node.path_prev    = parent;
@@ -69,7 +76,7 @@ bool pathlib_makenode_adaptive(entity parent,vector start, vector to, vector goa
 
     if(inwater(parent.origin))
     {
-        LOG_TRACE("FromWater");
+        LOG_DEBUG("FromWater");
         pathlib_expandnode = pathlib_expandnode_box;
         pathlib_movenode   = pathlib_swimnode;
     }
@@ -77,13 +84,13 @@ bool pathlib_makenode_adaptive(entity parent,vector start, vector to, vector goa
     {
         if(inwater(to))
         {
-            LOG_TRACE("ToWater");
+            LOG_DEBUG("ToWater");
             pathlib_expandnode = pathlib_expandnode_box;
             pathlib_movenode   = pathlib_walknode;
         }
         else
         {
-            LOG_TRACE("LandToLoand");
+            LOG_DEBUG("LandToLoand");
             //if(edge_check(parent.origin))
             //    return 0;
 
@@ -96,7 +103,7 @@ bool pathlib_makenode_adaptive(entity parent,vector start, vector to, vector goa
     entity node = pathlib_nodeatpoint(to);
     if(node)
     {
-        LOG_TRACE("NodeAtPoint");
+        LOG_DEBUG("NodeAtPoint");
         ++pathlib_merge_cnt;
 
         if(node.owner == openlist)
@@ -129,7 +136,7 @@ bool pathlib_makenode_adaptive(entity parent,vector start, vector to, vector goa
     {
         //pathlib_showsquare(where, 0 ,30);
         //pathlib_showsquare(parent.origin, 1 ,30);
-        LOG_TRACE("pathlib_movenode_goodnode = 0");
+        LOG_DEBUG("pathlib_movenode_goodnode = 0");
         return false;
     }
 
@@ -137,9 +144,9 @@ bool pathlib_makenode_adaptive(entity parent,vector start, vector to, vector goa
 
     if(pathlib_nodeatpoint(where))
     {
-        LOG_TRACE("NAP WHERE :",vtos(where));
-        LOG_TRACE("not NAP TO:",vtos(to));
-        LOG_TRACE("NAP-NNAP:",ftos(vlen(to-where)));
+        LOG_DEBUG("NAP WHERE :",vtos(where));
+        LOG_DEBUG("not NAP TO:",vtos(to));
+        LOG_DEBUG("NAP-NNAP:",ftos(vlen(to-where)));
         return false;
     }
 
@@ -147,7 +154,7 @@ bool pathlib_makenode_adaptive(entity parent,vector start, vector to, vector goa
     if(dodge)
         if (!tile_check(parent, where))
         {
-            LOG_TRACE("tile_check fail");
+            LOG_DEBUG("tile_check fail");
 #if DEBUGPATHING
             pathlib_showsquare(where, 0 ,30);
 #endif
@@ -263,27 +270,29 @@ void pathlib_cleanup()
 
     //return;
 
-    FOREACH_ENTITY_FLOAT(is_path_node, true,
+    IL_EACH(g_pathlib_nodes, it.is_path_node,
     {
     	dumpnode(it);
     });
 
+    IL_CLEAR(g_pathlib_nodes);
+
     if(openlist)
         delete(openlist);
 
     if(closedlist)
         delete(closedlist);
 
-    openlist       = NULL;
-    closedlist     = NULL;
+    openlist = NULL;
+    closedlist = NULL;
 }
 
 float Cosine_Interpolate(float a, float b, float c)
 {
-	float ft = c * 3.1415927;
+	float ft = c * M_PI;
 	float f = (1 - cos(ft)) * 0.5;
 
-	return  a*(1-f) + b*f;
+	return a*(1-f) + b*f;
 }
 
 bool buildpath_nodefilter_directional(vector n,vector c,vector p)
@@ -421,18 +430,18 @@ entity pathlib_astar(entity this, vector from, vector to)
 
     from.x = fsnap(from.x, pathlib_gridsize);
     from.y = fsnap(from.y, pathlib_gridsize);
-    //from_z += 32;
+    //from.z += 32;
 
     to.x = fsnap(to.x, pathlib_gridsize);
     to.y = fsnap(to.y, pathlib_gridsize);
-    //to_z += 32;
+    //to.z += 32;
 
-    LOG_TRACE("AStar init");
+    LOG_DEBUG("AStar init");
     entity path = pathlib_mknode(from, NULL);
     pathlib_close_node(path, to);
     if(pathlib_foundgoal)
     {
-        LOG_TRACE("AStar: Goal found on first node!");
+        LOG_DEBUG("AStar: Goal found on first node!");
 
         open           = new(path_end);
         open.owner     = open;
@@ -463,7 +472,7 @@ entity pathlib_astar(entity this, vector from, vector to)
     {
         if((gettime(GETTIME_REALTIME) - pathlib_starttime) > pathlib_maxtime)
         {
-            LOG_TRACE("Path took to long to compute!");
+            LOG_TRACE("Path took too long to compute!");
             LOG_TRACE("Nodes - created: ", ftos(pathlib_made_cnt));
             LOG_TRACE("Nodes -    open: ", ftos(pathlib_open_cnt));
             LOG_TRACE("Nodes -  merged: ", ftos(pathlib_merge_cnt));
@@ -484,7 +493,7 @@ entity pathlib_astar(entity this, vector from, vector to)
 
         if(pathlib_foundgoal)
         {
-            LOG_TRACE("Target found. Rebuilding and filtering path...");
+            LOG_DEBUG("Target found. Rebuilding and filtering path...");
             float ftime = gettime(GETTIME_REALTIME);
             ptime = ftime - ptime;