#include "common.qh"
#if defined(CSQC)
- #include <common/t_items.qh>
+ #include <client/items/items.qh>
#elif defined(MENUQC)
#elif defined(SVQC)
#include <common/weapons/_all.qh>
e.warpzone_targetorigin = other_org;
e.warpzone_angles = my_ang;
e.warpzone_targetangles = other_ang;
- FIXED_MAKE_VECTORS_NEW(my_ang, forward, right, up);
+ vector forward, right, up;
+ FIXED_MAKE_VECTORS(my_ang, forward, right, up);
e.warpzone_forward = forward;
FIXED_MAKE_VECTORS(other_ang, forward, right, up);
e.warpzone_targetforward = forward;
bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher)
{
- return !WarpZoneLib_BoxTouchesBrush(toucher.absmin, toucher.absmax, this, toucher);
+ vector emin = toucher.absmin, emax = toucher.absmax;
+ // the engine offsets absolute bounding boxes by a single quake unit
+ // we must undo that here to allow accurate touching
+ emin += '1 1 1';
+ emax -= '1 1 1';
+ return !WarpZoneLib_BoxTouchesBrush(emin, emax, this, toucher);
}
void WarpZoneLib_MoveOutOfSolid_Expand(entity e, vector by)
{
- float eps = 0.0625;
+ const float eps = 0.0625;
tracebox(e.origin, e.mins - '1 1 1' * eps, e.maxs + '1 1 1' * eps, e.origin + by, MOVE_WORLDONLY, e);
if (trace_startsolid)
return;