X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fspawnpoints.qh;h=92af8df66fe017167bf2b64a6127235a2e6e2d50;hb=b0c92481c72ae52b468998c31fb78f809a99bb53;hp=e9a3bb993509d017a9cbd88c11a0ed32e4cffd5e;hpb=35e8f712933b0ebf9b163b7289cf975825b33803;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/spawnpoints.qh b/qcsrc/server/spawnpoints.qh
index e9a3bb993..92af8df66 100644
--- a/qcsrc/server/spawnpoints.qh
+++ b/qcsrc/server/spawnpoints.qh
@@ -1,82 +1,15 @@
-#ifndef SPAWNPOINTS_H
-#define SPAWNPOINTS_H
+#pragma once
 
-#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"
-#endif
+// spawnpoint prios
+const int SPAWN_PRIO_NEAR_TEAMMATE_FOUND = 200;
+const int SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM = 100;
+const int SPAWN_PRIO_RACE_PREVIOUS_SPAWN = 50;
+const int SPAWN_PRIO_GOOD_DISTANCE = 10;
 
 .vector spawnpoint_score;
 float spawnpoint_nag;
-float SpawnEvent_Send(entity to, float sf);
-entity Spawn_FilterOutBadSpots(entity firstspot, float mindist, float teamcheck);
-entity SelectSpawnPoint (float anypoint);
-#endif
\ No newline at end of file
+bool SpawnEvent_Send(entity this, entity to, int sf);
+entity Spawn_FilterOutBadSpots(entity this, entity firstspot, float mindist, float teamcheck);
+entity SelectSpawnPoint(entity this, bool anypoint);
+spawnfunc(info_player_deathmatch);
+void spawnpoint_use(entity this, entity actor, entity trigger);