wp.colormod = '1 1 0'; // yellow
else if (wp.wpflags & WAYPOINTFLAG_SUPPORT)
wp.colormod = '0 1 0'; // green
- else if (wp.wpflags & WAYPOINTFLAG_NORELINK)
+ else if (wp.wpflags & WAYPOINTFLAG_CUSTOM_JP)
+ wp.colormod = '1 0.5 0'; // orange
+ else if (wp.wpflags & WAYPOINTFLAG_TELEPORT)
+ wp.colormod = '1 0.5 0'; // orange
+ else if (wp.wpflags & WAYPOINTFLAG_LADDER)
+ wp.colormod = '1 0.5 0'; // orange
+ else if (wp.wpflags & WAYPOINTFLAG_JUMP)
wp.colormod = '1 0.5 0'; // orange
else if (wp.wpflags & WAYPOINTFLAG_CROUCH)
wp.colormod = '0 1 1'; // cyan
wp.model = "";
}
+string waypoint_get_type_name(entity wp)
+{
+ if (wp.wpflags & WAYPOINTFLAG_ITEM) return "^1Item waypoint";
+ else if (wp.wpflags & WAYPOINTFLAG_CROUCH) return "^5Crouch waypoint";
+ else if (wp.wpflags & WAYPOINTFLAG_JUMP) return "^xf80Jump waypoint";
+ else if (wp.wpflags & WAYPOINTFLAG_SUPPORT) return "^2Support waypoint";
+ else if (waypoint_has_hardwiredlinks(wp)) return "^x80fHardwired waypoint";
+ else if (wp.wpflags & WAYPOINTFLAG_LADDER) return "^3Ladder waypoint";
+ else if (wp.wpflags & WAYPOINTFLAG_TELEPORT)
+ {
+ if (!wp.wpisbox) return "^3Warpzone waypoint";
+ else if (wp.wpflags & WAYPOINTFLAG_CUSTOM_JP) return "^3Custom jumppad waypoint";
+ else
+ {
+ IL_EACH(g_jumppads, boxesoverlap(wp.absmin, wp.absmax, it.absmin, it.absmax),
+ { return "^3Jumppad waypoint"; });
+ return "^3Teleport waypoint";
+ }
+ }
+
+ return "^7Waypoint";
+}
+
entity waypoint_get(vector m1, vector m2)
{
if (m1 == m2)
// spawn only one destination waypoint for teleports teleporting player to the exact same spot
// otherwise links loaded from file would be applied only to the first destination
// waypoint since link format doesn't specify waypoint entities but just positions
- if((f & WAYPOINTFLAG_GENERATED) && !(f & (WAYPOINTFLAG_NORELINK | WAYPOINTFLAG_PERSONAL)) && m1 == m2)
+ if((f & WAYPOINTFLAG_GENERATED) && !(f & (WPFLAGMASK_NORELINK | WAYPOINTFLAG_PERSONAL)) && m1 == m2)
{
IL_EACH(g_waypoints, boxesoverlap(m1, m2, it.absmin, it.absmax),
{
bool start_wp_is_hardwired;
bool start_wp_is_support;
-void waypoint_clear_start_wp(entity pl, bool warn)
+void waypoint_clear_start_wp_globals(entity pl, bool warn)
{
start_wp_is_spawned = false;
start_wp_origin = '0 0 0';
void waypoint_start_hardwiredlink(entity pl)
{
entity wp = pl.nearestwaypoint;
- if ((!start_wp_is_spawned || start_wp_is_hardwired) && wp && !(wp.wpflags & WAYPOINTFLAG_NORELINK))
+ if ((!start_wp_is_spawned || start_wp_is_hardwired) && wp && !(wp.wpflags & WPFLAGMASK_NORELINK))
{
start_wp_is_hardwired = true;
start_wp_is_spawned = true;
{
crosshair_trace(pl);
org = trace_endpos - eZ * PL_MIN_CONST.z;
- if (!start_wp_is_support)
+ if (!(start_wp_is_hardwired || start_wp_is_support))
IL_EACH(g_jumppads, boxesoverlap(org + PL_MIN_CONST, org + PL_MAX_CONST, it.absmin, it.absmax),
{
jp = it;
if (jp)
{
e = NULL;
- IL_EACH(g_waypoints, it.wpflags & WAYPOINTFLAG_NORELINK
+ IL_EACH(g_waypoints, it.wpflags & WPFLAGMASK_NORELINK
&& boxesoverlap(org + PL_MIN_CONST, org + PL_MAX_CONST, it.absmin, it.absmax),
{
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 | WAYPOINTFLAG_NORELINK);
+ e = waypoint_spawn(jp.absmin - PL_MAX_CONST + '1 1 1', jp.absmax - PL_MIN_CONST + '-1 -1 -1', WAYPOINTFLAG_TELEPORT);
if (!pl.wp_locked)
pl.wp_locked = e;
}
- else if (is_jump_wp)
- {
- entity wp_found = waypoint_get(org, org);
- if (wp_found && !(wp_found.wpflags & WAYPOINTFLAG_JUMP))
- {
- LOG_INFO("Error: can't spawn a jump waypoint over an existent waypoint of a different type\n");
- return;
- }
- e = waypoint_spawn(org, org, WAYPOINTFLAG_JUMP | WAYPOINTFLAG_NORELINK);
- if (!pl.wp_locked)
- pl.wp_locked = e;
- }
- else if (is_support_wp)
+ else if (is_jump_wp || is_support_wp)
{
+ int type_flag = (is_jump_wp) ? WAYPOINTFLAG_JUMP : WAYPOINTFLAG_SUPPORT;
+
entity wp_found = waypoint_get(org, org);
- if (wp_found && !(wp_found.wpflags & WAYPOINTFLAG_SUPPORT))
+ if (wp_found && !(wp_found.wpflags & type_flag))
{
- LOG_INFO("Error: can't spawn a support waypoint over an existent waypoint of a different type\n");
+ LOG_INFOF("Error: can't spawn a %s waypoint over an existent waypoint of a different type\n", (is_jump_wp) ? "Jump" : "Support");
return;
}
- e = waypoint_spawn(org, org, WAYPOINTFLAG_SUPPORT | WAYPOINTFLAG_NORELINK);
+ e = waypoint_spawn(org, org, type_flag);
if (!pl.wp_locked)
pl.wp_locked = e;
}
{
LOG_INFOF("Couldn't spawn waypoint at %v\n", org);
if (start_wp_is_spawned)
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
return;
}
entity start_wp = NULL;
if (start_wp_is_spawned)
{
- IL_EACH(g_waypoints, (start_wp_is_hardwired || it.wpflags & WAYPOINTFLAG_NORELINK)
+ IL_EACH(g_waypoints, (start_wp_is_hardwired || it.wpflags & WPFLAGMASK_NORELINK)
&& boxesoverlap(start_org, start_org, it.absmin, it.absmax),
{
start_wp = it; break;
{
// should not happen
LOG_INFOF("Couldn't find start waypoint at %v\n", start_org);
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
return;
}
if (start_wp_is_hardwired)
{
LOG_INFO("Error: hardwired links can be created only between 2 existing (and unconnected) waypoints.\n");
waypoint_remove(e);
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
waypoint_spawn_fromeditor(pl, at_crosshair, is_jump_wp, is_crouch_wp, is_support_wp);
return;
}
if (start_wp == e)
{
LOG_INFO("Error: start and destination waypoints coincide.\n");
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
return;
}
if (waypoint_islinked(start_wp, e))
{
LOG_INFO("Error: waypoints are already linked.\n");
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
return;
}
waypoint_addlink(start_wp, e);
if (e.SUPPORT_WP)
{
LOG_INFOF("Waypoint %v has already a support waypoint, delete it first.\n", e.origin);
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
return;
}
// clear all links to e
if (!(jp || is_jump_wp || is_support_wp || start_wp_is_hardwired))
waypoint_schedulerelink(e);
- string wp_type_str = "Waypoint";
- if (is_crouch_wp) wp_type_str = "Crouch waypoint";
- else if (is_jump_wp) wp_type_str = "Jump waypoint";
- else if (is_support_wp) wp_type_str = "Support waypoint";
- else if (jp) wp_type_str = "Custom jumppad waypoint";
+ string wp_type_str = waypoint_get_type_name(e);
- bprint(strcat(wp_type_str, " spawned at ", vtos(e.origin), "\n"));
+ bprint(strcat(wp_type_str, "^7 spawned at ", vtos(e.origin), "\n"));
if (start_wp_is_spawned)
{
}
else if (start_wp_is_spawned)
{
- waypoint_clear_start_wp(pl, false);
+ waypoint_clear_start_wp_globals(pl, false);
}
}
void waypoint_remove(entity wp)
{
- if (wp.SUPPORT_WP)
- waypoint_remove(wp.SUPPORT_WP); // remove support waypoint too
-
IL_EACH(g_waypoints, it != wp,
{
if (it.SUPPORT_WP == wp)
if (e.wpflags & WAYPOINTFLAG_GENERATED)
{
if (start_wp_is_spawned)
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
return;
}
if (waypoint_has_hardwiredlinks(e))
{
- LOG_INFO("^1Warning: ^7Removal of hardwired waypoints is not allowed in the editor. Please remove links from/to this waypoint (", vtos(e.origin), ") by hand from maps/", mapname, ".waypoints.hardwired\n");
+ LOG_INFO("Can't remove a waypoint with hardwired links, remove them with \"wpeditor hardwire\" first\n");
return;
}
}
if (start_wp_is_spawned)
- waypoint_clear_start_wp(pl, true);
+ waypoint_clear_start_wp_globals(pl, true);
}
void waypoint_removelink(entity from, entity to)
{
- if (from == to || (from.wpflags & WAYPOINTFLAG_NORELINK && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))))
+ if (from == to || (from.wpflags & WPFLAGMASK_NORELINK && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))))
return;
entity fromwp31_prev = from.wp31;
{
if (from == to || waypoint_islinked(from, to))
return;
- if (c == -1 && (from.wpflags & WAYPOINTFLAG_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)))
+ if (c == -1 && (from.wpflags & WPFLAGMASK_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)))
return;
if(c == -1)
void waypoint_addlink(entity from, entity to)
{
- if ((from.wpflags & WAYPOINTFLAG_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)))
+ if ((from.wpflags & WPFLAGMASK_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)))
waypoint_addlink_for_custom_jumppad(from, to);
else
waypoint_addlink_customcost(from, to, -1);
{
if (boxesoverlap(this.absmin, this.absmax, it.absmin, it.absmax))
{
- if (!(this.wpflags & WAYPOINTFLAG_NORELINK))
+ if (!(this.wpflags & WPFLAGMASK_NORELINK))
waypoint_addlink(this, it);
- if (!(it.wpflags & WAYPOINTFLAG_NORELINK))
+ if (!(it.wpflags & WPFLAGMASK_NORELINK))
waypoint_addlink(it, this);
}
else
wp.enemy = NULL;
if (!(wp.wpflags & WAYPOINTFLAG_PERSONAL))
wp.owner = NULL;
- if (!(wp.wpflags & WAYPOINTFLAG_NORELINK))
+ if (!(wp.wpflags & WPFLAGMASK_NORELINK))
waypoint_clearlinks(wp);
// schedule an actual relink on next frame
setthink(wp, waypoint_think);
{
waypoint_addlink(wp_from, wp_to);
waypoint_mark_hardwiredlink(wp_from, wp_to);
- } else if (wp_from.wpflags & WAYPOINTFLAG_NORELINK
+ } else if (wp_from.wpflags & WPFLAGMASK_NORELINK
&& (wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)
|| (wp_from.wpisbox && wp_from.wpflags & WAYPOINTFLAG_TELEPORT)))
{
float waypoint_loadall()
{
string s;
- float file, cwp, cwb, fl;
+ int file, cwp, cwb, fl;
vector m1, m2;
cwp = 0;
cwb = 0;
if (!s)
break;
fl = stof(s);
+ if (fl & WAYPOINTFLAG_NORELINK__DEPRECATED)
+ fl &= ~WAYPOINTFLAG_NORELINK__DEPRECATED;
waypoint_spawn(m1, m2, fl);
if (m1 == m2)
cwp = cwp + 1;
{
entity w;
entity dw;
- w = waypoint_spawn(org1, org2, WAYPOINTFLAG_GENERATED | teleport_flag | WAYPOINTFLAG_NORELINK);
+ w = waypoint_spawn(org1, org2, WAYPOINTFLAG_GENERATED | teleport_flag);
dw = waypoint_spawn(destination1, destination2, WAYPOINTFLAG_GENERATED);
// one way link to the destination
w.wp00_original = dw;
wp = trace_ent;
if (wp != it.wp_aimed)
{
- str = sprintf("\necho ^2WP info^7: entity: %d, flags: %d, origin: %s\n", etof(wp), wp.wpflags, vtos(wp.origin));
+ string wp_type_str = waypoint_get_type_name(wp);
+ str = sprintf("\necho Entity %d: %s^7, flags: %d, origin: %s\n", etof(wp), wp_type_str, wp.wpflags, vtos(wp.origin));
if (wp.wpisbox)
str = strcat(str, sprintf("echo \" absmin: %s, absmax: %s\"\n", vtos(wp.absmin), vtos(wp.absmax)));
stuffcmd(it, str);
- str = sprintf("entity: %d\nflags: %d\norigin: %s", etof(wp), wp.wpflags, vtos(wp.origin));
+ str = sprintf("Entity %d: %s^7\nflags: %d\norigin: %s", etof(wp), wp_type_str, wp.wpflags, vtos(wp.origin));
if (wp.wpisbox)
str = strcat(str, sprintf(" \nabsmin: %s\nabsmax: %s", vtos(wp.absmin), vtos(wp.absmax)));
debug_text_3d(wp.origin, str, 0, 7, '0 0 0');
}
float bestdist = maxdist;
- IL_EACH(g_waypoints, it != wp && !(it.wpflags & WAYPOINTFLAG_NORELINK),
+ IL_EACH(g_waypoints, it != wp && !(it.wpflags & WPFLAGMASK_NORELINK),
{
float d = vlen(wp.origin - it.origin) + vlen(it.origin - porg);
if(d < bestdist)
}
// automatically create missing waypoints
-.entity botframe_autowaypoints_lastwp0, botframe_autowaypoints_lastwp1;
void botframe_autowaypoints_fix(entity p, float walkfromwp, .entity fld)
{
float r = botframe_autowaypoints_fix_from(p, walkfromwp, p.(fld), fld);
});
}
+//.entity botframe_autowaypoints_lastwp0;
+.entity botframe_autowaypoints_lastwp1;
void botframe_autowaypoints()
{
FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it) && !IS_DEAD(it), {