#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++;
}
{
vector org = '0 0 0';
int ctf_flags = 0;
- for (int i = 0; i < 6; i++)
+ for (int i = 0; i < 6; ++i)
{
if (argv(arg_idx + i) != "")
ctf_flags++;
else
{
vector v1, v2, v3, v4, v5, v6;
- for (int i = 1; i <= ctf_flags; i++)
+ for (int i = 1; i <= ctf_flags; ++i)
{
if (i == 1) { v1 = stov(argv(arg_idx++)); org = v1 / ctf_flags; }
else if (i == 2) { v2 = stov(argv(arg_idx++)); org += v2 / ctf_flags; }
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;
e = it; break;
});
if (!e)
- e = waypoint_spawn(jp.absmin - PL_MAX_CONST + '1 1 1', jp.absmax - PL_MIN_CONST + '-1 -1 -1', WAYPOINTFLAG_TELEPORT);
+ e = waypoint_spawn(jp.absmin - PL_MAX_CONST, jp.absmax - PL_MIN_CONST, WAYPOINTFLAG_TELEPORT);
if (!pl.wp_locked)
pl.wp_locked = e;
}
{
waypoint_addlink(wp_from, wp_to);
waypoint_mark_hardwiredlink(wp_from, wp_to);
- } else if (wp_from.wpflags & WPFLAGMASK_NORELINK
- && ((wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))
- || (wp_from.wpisbox && wp_from.wpflags & WAYPOINTFLAG_TELEPORT)))
+ }
+ else if ((wp_from.wpflags & WPFLAGMASK_NORELINK) && ((wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))
+ || (wp_from.wpisbox && (wp_from.wpflags & WAYPOINTFLAG_TELEPORT))))
{
waypoint_addlink(wp_from, wp_to);
}
LOG_TRACE("loaded ", ftos(c), " waypoint links from maps/", mapname, ".waypoints.hardwired");
}
+float waypoint_get_assigned_link_cost(entity w, float i)
+{
+ switch(i)
+ {
+ case 0: return w.wp00mincost;
+ case 1: return w.wp01mincost;
+ case 2: return w.wp02mincost;
+ case 3: return w.wp03mincost;
+ case 4: return w.wp04mincost;
+ case 5: return w.wp05mincost;
+ case 6: return w.wp06mincost;
+ case 7: return w.wp07mincost;
+ case 8: return w.wp08mincost;
+ case 9: return w.wp09mincost;
+ case 10: return w.wp10mincost;
+ case 11: return w.wp11mincost;
+ case 12: return w.wp12mincost;
+ case 13: return w.wp13mincost;
+ case 14: return w.wp14mincost;
+ case 15: return w.wp15mincost;
+ case 16: return w.wp16mincost;
+ case 17: return w.wp17mincost;
+ case 18: return w.wp18mincost;
+ case 19: return w.wp19mincost;
+ case 20: return w.wp20mincost;
+ case 21: return w.wp21mincost;
+ case 22: return w.wp22mincost;
+ case 23: return w.wp23mincost;
+ case 24: return w.wp24mincost;
+ case 25: return w.wp25mincost;
+ case 26: return w.wp26mincost;
+ case 27: return w.wp27mincost;
+ case 28: return w.wp28mincost;
+ case 29: return w.wp29mincost;
+ case 30: return w.wp30mincost;
+ case 31: return w.wp31mincost;
+ default: return -1;
+ }
+}
+
entity waypoint_get_link(entity w, float i)
{
switch(i)
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));
void waypoint_spawnforteleporter(entity e, vector destination, float timetaken, entity tracetest_ent)
{
destination = waypoint_fixorigin(destination, tracetest_ent);
- waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, e.absmin - PL_MAX_CONST + '1 1 1', e.absmax - PL_MIN_CONST + '-1 -1 -1', destination, destination, timetaken);
+ waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, e.absmin - PL_MAX_CONST, e.absmax - PL_MIN_CONST, destination, destination, timetaken);
}
entity waypoint_spawnpersonal(entity this, vector position)
projects / xonotic / xonotic-data.pk3dir.git / blobdiff