X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fpathlib%2Futility.qc;h=9028f85e4f8be3ab4d65a21656634151522ecb4f;hb=a97b89297fa91ae42b9d56c262662eb34ede3e45;hp=7a0aec8652ed0ae8f32b2594da45ad49459a6165;hpb=786db02b0c9aa618c581b7c3fe7392ad114797d8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/pathlib/utility.qc b/qcsrc/server/pathlib/utility.qc index 7a0aec865..9028f85e4 100644 --- a/qcsrc/server/pathlib/utility.qc +++ b/qcsrc/server/pathlib/utility.qc @@ -1,18 +1,6 @@ -float fsnap(float val,float fsize) -{ - return rint(val / fsize) * fsize; -} +#include "utility.qh" -vector vsnap(vector point,float fsize) -{ - vector vret; - - vret_x = rint(point_x / fsize) * fsize; - vret_y = rint(point_y / fsize) * fsize; - vret_z = ceil(point_z / fsize) * fsize; - - return vret; -} +#include "pathlib.qh" float location_isok(vector point, float water_isok, float air_isok) { @@ -68,13 +56,13 @@ entity pathlib_nodeatpoint(vector where) ++pathlib_searched_cnt; - where_x = fsnap(where_x,pathlib_gridsize); - where_y = fsnap(where_y,pathlib_gridsize); + where.x = fsnap(where.x,pathlib_gridsize); + where.y = fsnap(where.y,pathlib_gridsize); node = findradius(where,pathlib_gridsize * 0.5); while(node) { - if(node.is_path_node == TRUE) + if(node.is_path_node == true) return node; node = node.chain; @@ -84,7 +72,7 @@ entity pathlib_nodeatpoint(vector where) } float tile_check_cross(vector where) -{ +{SELFPARAM(); vector p,f,r; f = PLIB_FORWARD * tile_check_size; @@ -119,7 +107,7 @@ float tile_check_cross(vector where) } float tile_check_plus(vector where) -{ +{SELFPARAM(); vector p,f,r; f = PLIB_FORWARD * tile_check_size; @@ -154,7 +142,7 @@ float tile_check_plus(vector where) } float tile_check_plus2(vector where) -{ +{SELFPARAM(); vector p,f,r; float i = 0, e = 0;