void waypoint_spawnforitem_force(entity e, vector org);
void waypoint_spawnforitem(entity e);
-void waypoint_spawnforteleporter(entity e, vector destination, float timetaken);
-void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken);
+void waypoint_spawnforteleporter(entity e, vector destination, float timetaken, entity tracetest_ent);
+void waypoint_spawnforteleporter_wz(entity e, vector org, vector destination, float timetaken, entity tracetest_ent);
void botframe_showwaypointlinks();
float waypoint_loadall();
void waypoint_unreachable(entity pl);
-vector waypoint_fixorigin(vector position);
+vector waypoint_fixorigin(vector position, entity tracetest_ent);
void botframe_autowaypoints();