zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 23:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed Line_SetVisualPortal special. This will be folded into Line_SetPortal later

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-05 14:24:20 +01:00
parent 2516b8f8af
commit 6639984772
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/actionspecials.h
View file

@ -139,7 +139,6 @@ DEFINE_SPECIAL(Sector_ChangeSound, 140, 2, 2, 2)
DEFINE_SPECIAL(Teleport_NoStop, 154, 2, 3, 3) DEFINE_SPECIAL(Teleport_NoStop, 154, 2, 3, 3)
// portal specials // portal specials
DEFINE_SPECIAL(Line_SetVisualPortal, 155, -1, -1, 3)
DEFINE_SPECIAL(Line_SetPortal, 156, -1, -1, 3) DEFINE_SPECIAL(Line_SetPortal, 156, -1, -1, 3)
// GZDoom/Vavoom specials // GZDoom/Vavoom specials
// Although ZDoom doesn't support them it's better to have them defined so that // Although ZDoom doesn't support them it's better to have them defined so that

1
src/p_setup.cpp
View file

@ -1962,7 +1962,6 @@ void P_SetLineID (int i, line_t *ld)
break; break;
case Line_SetPortal: case Line_SetPortal:
case Line_SetVisualPortal:
setid = ld->args[1]; // 0 = target id, 1 = this id, 2 = plane anchor setid = ld->args[1]; // 0 = target id, 1 = this id, 2 = plane anchor
break; break;
} }

5
src/portal.cpp
View file

@ -91,8 +91,7 @@ bool P_CheckPortal(line_t* line)
line->portal_passive = true; line->portal_passive = true;
line->portal_dst = line; line->portal_dst = line;
} }
else if (line->special == Line_SetPortal || else if (line->special == Line_SetPortal)
line->special == Line_SetVisualPortal)
{ {
// portal destination is special argument #0 // portal destination is special argument #0
line_t* dst = NULL; line_t* dst = NULL;
@ -117,7 +116,7 @@ bool P_CheckPortal(line_t* line)
{ {
line->portal = true; line->portal = true;
line->portal_mirror = false; 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; line->portal_dst = dst;
} }
else else