X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fpathlib%2Fpathlib.qh;h=9afbcd55451c3a8ecbff5cca7fc094d05f0e6d41;hb=35e8f712933b0ebf9b163b7289cf975825b33803;hp=d1b6667d715f4a6075f992f999ceb846a608e339;hpb=265b681e0fb49239df1bfc431a903f66244a3172;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh
index d1b6667d7..9afbcd554 100644
--- a/qcsrc/server/pathlib/pathlib.qh
+++ b/qcsrc/server/pathlib/pathlib.qh
@@ -1,3 +1,89 @@
+#ifndef PATHLIB_H
+#define PATHLIB_H
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include "../../common/util-pre.qh"
+    #include "../sys-pre.qh"
+    #include "../../dpdefs/progsdefs.qh"
+    #include "../../dpdefs/dpextensions.qh"
+    #include "../sys-post.qh"
+    #include "../../warpzonelib/anglestransform.qh"
+    #include "../../warpzonelib/mathlib.qh"
+    #include "../../warpzonelib/common.qh"
+    #include "../../warpzonelib/util_server.qh"
+    #include "../../warpzonelib/server.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/stats.qh"
+    #include "../../common/teams.qh"
+    #include "../../common/util.qh"
+    #include "../../common/nades.qh"
+    #include "../../common/buffs.qh"
+    #include "../../common/test.qh"
+    #include "../../common/counting.qh"
+    #include "../../common/urllib.qh"
+    #include "../../common/command/markup.qh"
+    #include "../../common/command/rpn.qh"
+    #include "../../common/command/generic.qh"
+    #include "../../common/command/shared_defs.qh"
+    #include "../../common/net_notice.qh"
+    #include "../../common/animdecide.qh"
+    #include "../../common/monsters/monsters.qh"
+    #include "../../common/monsters/sv_monsters.qh"
+    #include "../../common/monsters/spawn.qh"
+    #include "../../common/weapons/config.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "../weapons/accuracy.qh"
+    #include "../weapons/common.qh"
+    #include "../weapons/csqcprojectile.qh"
+    #include "../weapons/hitplot.qh"
+    #include "../weapons/selection.qh"
+    #include "../weapons/spawning.qh"
+    #include "../weapons/throwing.qh"
+    #include "../weapons/tracing.qh"
+    #include "../weapons/weaponstats.qh"
+    #include "../weapons/weaponsystem.qh"
+    #include "../t_items.qh"
+    #include "../autocvars.qh"
+    #include "../constants.qh"
+    #include "../defs.qh"
+    #include "../../common/notifications.qh"
+    #include "../../common/deathtypes.qh"
+    #include "../mutators/mutators_include.qh"
+    #include "../tturrets/include/turrets_early.qh"
+    #include "../vehicles/vehicles_def.qh"
+    #include "../campaign.qh"
+    #include "../../common/campaign_common.qh"
+    #include "../../common/mapinfo.qh"
+    #include "../command/common.qh"
+    #include "../command/banning.qh"
+    #include "../command/radarmap.qh"
+    #include "../command/vote.qh"
+    #include "../command/getreplies.qh"
+    #include "../command/cmd.qh"
+    #include "../command/sv_cmd.qh"
+    #include "../../common/csqcmodel_settings.qh"
+    #include "../../csqcmodellib/common.qh"
+    #include "../../csqcmodellib/sv_model.qh"
+    #include "../anticheat.qh"
+    #include "../cheats.qh"
+    #include "../../common/playerstats.qh"
+    #include "../portals.qh"
+    #include "../g_hook.qh"
+    #include "../scores.qh"
+    #include "../spawnpoints.qh"
+    #include "../mapvoting.qh"
+    #include "../ipban.qh"
+    #include "../race.qh"
+    #include "../antilag.qh"
+    #include "../playerdemo.qh"
+    #include "../round_handler.qh"
+    #include "../item_key.qh"
+    #include "../secret.qh"
+#endif
+
+
 .entity pathlib_list;
 .entity path_next;
 .entity path_prev;
@@ -5,9 +91,9 @@
 #define inwater(point) (pointcontents(point) == CONTENT_WATER)
 #define medium spawnshieldtime
 
-#define PLIB_FORWARD '0 1 0'
+const vector PLIB_FORWARD = '0 1 0';
 //#define PLIB_BACK    '0 -1 0'
-#define PLIB_RIGHT   '1 0 0'
+const vector PLIB_RIGHT = '1 0 0';
 //#define PLIB_LEFT    '-1 0 0'
 
 #define DEBUGPATHING
@@ -28,16 +114,16 @@ entity start_node;
 .float pathlib_node_f;
 .float pathlib_node_c;
 
-#define pathlib_node_edgeflag_unknown        0
-#define pathlib_node_edgeflag_left           2
-#define pathlib_node_edgeflag_right          4
-#define pathlib_node_edgeflag_forward        8
-#define pathlib_node_edgeflag_back           16
-#define pathlib_node_edgeflag_backleft       32
-#define pathlib_node_edgeflag_backright      64
-#define pathlib_node_edgeflag_forwardleft    128
-#define pathlib_node_edgeflag_forwardright   256
-#define pathlib_node_edgeflag_none           512
+const float pathlib_node_edgeflag_unknown 		= 0;
+const float pathlib_node_edgeflag_left 			= 2;
+const float pathlib_node_edgeflag_right 		= 4;
+const float pathlib_node_edgeflag_forward 		= 8;
+const float pathlib_node_edgeflag_back 			= 16;
+const float pathlib_node_edgeflag_backleft 		= 32;
+const float pathlib_node_edgeflag_backright 	= 64;
+const float pathlib_node_edgeflag_forwardleft 	= 128;
+const float pathlib_node_edgeflag_forwardright 	= 256;
+const float pathlib_node_edgeflag_none 			= 512;
 .float pathlib_node_edgeflags;
 
 float pathlib_open_cnt;
@@ -55,7 +141,7 @@ float pathlib_movecost_waterfactor;
 float pathlib_foundgoal;
 
 float pathlib_starttime;
-#define pathlib_maxtime 60
+const float pathlib_maxtime = 60;
 
 entity best_open_node;
 
@@ -116,3 +202,4 @@ var float  pathlib_wpp_waypointcallback(entity wp, entity wp_prev);
 #include "expandnode.qc"
 #include "main.qc"
 #include "path_waypoint.qc"
+#endif
\ No newline at end of file