zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 14:51:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable TRACE_PCross and TRACE_Impact on ZScript side

Browse source
This commit is contained in:
ZZYZX 2018-01-21 05:06:00 +02:00 committed by Christoph Oelckers
parent 74b937620e
commit ee1a8f71bb
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_trace.cpp
View file

@ -996,6 +996,9 @@ DEFINE_ACTION_FUNCTION(DTracer, Trace)
// say thanks to oversimplifying the user API. // say thanks to oversimplifying the user API.
PARAM_INT(traceFlags); PARAM_INT(traceFlags);
// these are internal hacks.
traceFlags &= ~(TRACE_PCross | TRACE_Impact);
// Trace(vector3 start, Sector sector, vector3 direction, double maxDist, ETraceFlags traceFlags) // Trace(vector3 start, Sector sector, vector3 direction, double maxDist, ETraceFlags traceFlags)
bool res = Trace(DVector3(start_x, start_y, start_z), sector, DVector3(direction_x, direction_y, direction_z), maxDist, bool res = Trace(DVector3(start_x, start_y, start_z), sector, DVector3(direction_x, direction_y, direction_z), maxDist,
(ActorFlag)0xFFFFFFFF, 0xFFFFFFFF, nullptr, self->Results, traceFlags, &DTracer::TraceCallback, self); (ActorFlag)0xFFFFFFFF, 0xFFFFFFFF, nullptr, self->Results, traceFlags, &DTracer::TraceCallback, self);

4
wadsrc/static/zscript/base.txt
View file

@ -471,8 +471,8 @@ enum ETraceStatus
enum ETraceFlags enum ETraceFlags
{ {
TRACE_NoSky = 1, // Hitting the sky returns TRACE_HitNone TRACE_NoSky = 1, // Hitting the sky returns TRACE_HitNone
TRACE_PCross = 2, // Trigger SPAC_PCROSS lines //TRACE_PCross = 2, // Trigger SPAC_PCROSS lines
TRACE_Impact = 4, // Trigger SPAC_IMPACT lines //TRACE_Impact = 4, // Trigger SPAC_IMPACT lines
TRACE_PortalRestrict = 8, // Cannot go through portals without a static link offset. TRACE_PortalRestrict = 8, // Cannot go through portals without a static link offset.
TRACE_ReportPortals = 16 // Report any portal crossing to the TraceCallback TRACE_ReportPortals = 16 // Report any portal crossing to the TraceCallback
} }