From 6639984772a3409a1a11d2c5e102352ad345ca15 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 5 Feb 2016 14:24:20 +0100 Subject: [PATCH] - removed Line_SetVisualPortal special. This will be folded into Line_SetPortal later --- src/actionspecials.h | 1 - src/p_setup.cpp | 1 - src/portal.cpp | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/actionspecials.h b/src/actionspecials.h index a9813c24f3..7e783051e5 100644 --- a/src/actionspecials.h +++ b/src/actionspecials.h @@ -139,7 +139,6 @@ DEFINE_SPECIAL(Sector_ChangeSound, 140, 2, 2, 2) DEFINE_SPECIAL(Teleport_NoStop, 154, 2, 3, 3) // portal specials -DEFINE_SPECIAL(Line_SetVisualPortal, 155, -1, -1, 3) DEFINE_SPECIAL(Line_SetPortal, 156, -1, -1, 3) // GZDoom/Vavoom specials // Although ZDoom doesn't support them it's better to have them defined so that diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 82e4a88ba8..5988a73cf7 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -1962,7 +1962,6 @@ void P_SetLineID (int i, line_t *ld) break; case Line_SetPortal: - case Line_SetVisualPortal: setid = ld->args[1]; // 0 = target id, 1 = this id, 2 = plane anchor break; } diff --git a/src/portal.cpp b/src/portal.cpp index 7e8405d570..d45219ea30 100644 --- a/src/portal.cpp +++ b/src/portal.cpp @@ -91,8 +91,7 @@ bool P_CheckPortal(line_t* line) line->portal_passive = true; line->portal_dst = line; } - else if (line->special == Line_SetPortal || - line->special == Line_SetVisualPortal) + else if (line->special == Line_SetPortal) { // portal destination is special argument #0 line_t* dst = NULL; @@ -117,7 +116,7 @@ bool P_CheckPortal(line_t* line) { line->portal = true; line->portal_mirror = false; - line->portal_passive = (line->special == Line_SetVisualPortal); + line->portal_passive = true;// !!(line->args[2] & PORTAL_VISUAL; (line->special == Line_SetVisualPortal); line->portal_dst = dst; } else