#include "waypoints.qh"
-#include <server/defs.qh>
-#include <server/miscfunctions.qh>
-#include "cvars.qh"
-
-#include "bot.qh"
-#include "navigation.qh"
-
-#include <common/state.qh>
-
-#include "../../antilag.qh"
-
+#include <common/animdecide.qh>
#include <common/constants.qh>
#include <common/debug.qh>
+#include <common/gamemodes/_mod.qh>
#include <common/mapobjects/trigger/jumppads.qh>
#include <common/net_linked.qh>
#include <common/physics/player.qh>
-
+#include <common/state.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
#include <lib/warpzone/common.qh>
#include <lib/warpzone/util_server.qh>
-
+#include <server/antilag.qh>
+#include <server/bot/default/bot.qh>
+#include <server/bot/default/cvars.qh>
+#include <server/bot/default/navigation.qh>
+#include <server/items/items.qh>
+#include <server/spawnpoints.qh>
+#include <server/weapons/tracing.qh>
+
+STATIC_INIT(waypoints)
+{
+ waypointeditor_enabled = autocvar_g_waypointeditor;
+}
.entity spawnpointmodel;
void waypoint_unreachable(entity pl)
{
LOG_INFO("spawn without waypoint: ", etos(it), " ", vtos(it.origin), "\n");
it.spawnpointmodel.effects |= EF_NODEPTHTEST;
_setmodel(it.spawnpointmodel, pl.model);
- it.spawnpointmodel.frame = pl.frame;
+ it.spawnpointmodel.frame = ANIM_idle.m_id;
it.spawnpointmodel.skin = pl.skin;
- it.spawnpointmodel.colormap = pl.colormap;
- it.spawnpointmodel.colormod = pl.colormod;
- it.spawnpointmodel.glowmod = pl.glowmod;
+ it.spawnpointmodel.colormap = 1024 + 68;
+ it.spawnpointmodel.glowmod = '1 0 0';
+ it.spawnpointmodel.angles = it.angles;
setsize(it.spawnpointmodel, PL_MIN_CONST, PL_MAX_CONST);
j++;
}
void waypoint_setupmodel(entity wp)
{
- if (autocvar_g_waypointeditor)
+ if (waypointeditor_enabled)
{
// TODO: add some sort of visible box in edit mode for box waypoints
vector m1 = wp.mins;
w.wpflags = f;
w.solid = SOLID_TRIGGER;
w.createdtime = time;
- setorigin(w, (m1 + m2) * 0.5);
+ w.origin = (m1 + m2) * 0.5;
+ if (waypointeditor_enabled)
+ setorigin(w, w.origin);
+ else // don't link into the world, only bots are aware of waypoints
+ make_pure(w);
setsize(w, m1 - w.origin, m2 - w.origin);
if (w.size)
w.wpisbox = true;
{
IL_PUSH(g_waypoints, this);
- setorigin(this, this.origin);
+ if (waypointeditor_enabled)
+ setorigin(this, this.origin);
+ else
+ make_pure(this);
// schedule a relink after other waypoints have had a chance to spawn
waypoint_clearlinks(this);
//waypoint_schedulerelink(this);
waypoint_version_loaded = ver;
LOG_TRACE("loaded ", ftos(cwp), " waypoints and ", ftos(cwb), " wayboxes from maps/", mapname, ".waypoints");
- if (autocvar_g_waypointeditor && autocvar_g_waypointeditor_symmetrical_allowload)
+ if (waypointeditor_enabled && autocvar_g_waypointeditor_symmetrical_allowload)
{
string sym_str = "";
cvar_set("g_waypointeditor_symmetrical", ftos(sym));