From f06021da11ee319da1cb8b4f7e785398e9e2b347 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 19 Jan 2018 00:44:30 +0100 Subject: [PATCH] Backported struct name change from gzdoom branch --- src/p_map.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index facecc99d..c89c466b7 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -4820,7 +4820,7 @@ DEFINE_ACTION_FUNCTION(AActor, LineAttack) // P_LineTrace // //========================================================================== -struct LineTraceData +struct CheckLineData { AActor *Caller; bool ThruSpecies; @@ -4830,7 +4830,7 @@ struct LineTraceData static ETraceStatus CheckLineTrace(FTraceResults &res, void *userdata) { - LineTraceData *TData = (LineTraceData *)userdata; + CheckLineData *TData = (CheckLineData *)userdata; if ( res.HitType == TRACE_CrossingPortal ) { TData->NumPortals++; @@ -4852,7 +4852,7 @@ bool P_LineTrace(AActor *t1, DAngle angle, double distance, double offsetside, FLineTraceData *outdata) { FTraceResults trace; - LineTraceData TData; + CheckLineData TData; TData.Caller = t1; TData.ThruSpecies = (flags & TRF_THRUSPECIES); TData.ThruActors = (flags & TRF_THRUACTORS);