From 23e53c17fc25c6906c246eb480f765b3ea70b226 Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 2 Mar 2019 23:21:56 +0000 Subject: [PATCH] This might not be needed anymore after the previous commit git-svn-id: https://svn.eduke32.com/eduke32@7375 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/polymost.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index f8066522f..94660737f 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -3788,8 +3788,11 @@ skip: ; int const ni = vsp[i].n; - if ((vsp[i].ctag == vsp[ni].ctag) && (vsp[i].ftag == vsp[ni].ftag) && - ((vsp[i].cy[1] <= vsp[ni].cy[1]) || (vsp[i].fy[1] <= vsp[ni].fy[1]))) + if ((vsp[i].ctag == vsp[ni].ctag) && (vsp[i].ftag == vsp[ni].ftag) +#ifdef COMBINE_STRIPS_IS_STILL_BUGGED + && ((vsp[i].cy[1] <= vsp[ni].cy[1]) || (vsp[i].fy[1] <= vsp[ni].fy[1])) +#endif + ) { vsp[i].cy[1] = vsp[ni].cy[1]; vsp[i].fy[1] = vsp[ni].fy[1];