zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 13:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bugs with Line_PortalSetTarget and added more portal geometry warnings

Browse source 
- A bug exists where portals that have been deactivated with Line_PortalSetTarget cannot be reactivated, even if given a valid target.
- Another bug exists where portals that were created in an inactive state (using a target line tag of 0) could never be activated. (Even with the above bugfix.)
- Linked portals that have been demoted to teleport portals because they do not have a return portal now emit a warning.
- Portals that are supposed to be traversable, but do not have back-sector now demote to visual portals and emit a warning, because nothing could ever possibly traverse them anyway.
This commit is contained in:
AntiBlueQuirk 2017-09-30 00:59:30 -05:00 committed by Christoph Oelckers
parent bbaec90f61
commit 4884a1f785
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/portal.cpp
View file

@ -307,10 +307,9 @@ void P_SpawnLinePortal(line_t* line)
port->mType = PORTT_TELEPORT; port->mType = PORTT_TELEPORT;
} }
} }
if (port->mDestination != nullptr) port->mDefFlags = port->mType == PORTT_VISUAL ? PORTF_VISIBLE :
{ port->mType == PORTT_TELEPORT ? PORTF_TYPETELEPORT :
port->mDefFlags = port->mType == PORTT_VISUAL ? PORTF_VISIBLE : port->mType == PORTT_TELEPORT ? PORTF_TYPETELEPORT : PORTF_TYPEINTERACTIVE; PORTF_TYPEINTERACTIVE;
}
} }
else if (line->args[2] == PORTT_LINKEDEE && line->args[0] == 0) else if (line->args[2] == PORTT_LINKEDEE && line->args[0] == 0)
{ {
@ -360,6 +359,13 @@ void P_SpawnLinePortal(line_t* line)
void P_UpdatePortal(FLinePortal *port) void P_UpdatePortal(FLinePortal *port)
{ {
if (port->mType != PORTT_VISUAL && port->mOrigin->backsector == nullptr && !(port->mOrigin->sidedef[0]->Flags & WALLF_POLYOBJ))
{
Printf(TEXTCOLOR_RED "Warning: Traversable portals must have a back-sector and empty space behind them (or be on a polyobject)! Changing line %d to visual-portal!\n", port->mOrigin->Index());
port->mType = PORTT_VISUAL;
port->mDefFlags &= ~(PORTF_PASSABLE | PORTF_SOUNDTRAVERSE);
}
if (port->mDestination == nullptr) if (port->mDestination == nullptr)
{ {
// Portal has no destination: switch it off // Portal has no destination: switch it off
@ -374,6 +380,7 @@ void P_UpdatePortal(FLinePortal *port)
// this is illegal. Demote the type to TELEPORT // this is illegal. Demote the type to TELEPORT
port->mType = PORTT_TELEPORT; port->mType = PORTT_TELEPORT;
port->mDefFlags &= ~PORTF_INTERACTIVE; port->mDefFlags &= ~PORTF_INTERACTIVE;
Printf(TEXTCOLOR_RED "Warning: linked portal did not have matching reverse portal. Changing line %d to teleport-portal!\n", port->mOrigin->Index());
} }
} }
else else
@ -466,6 +473,10 @@ static bool ChangePortalLine(line_t *line, int destid)
} }
SetRotation(portd); SetRotation(portd);
} }
else
{
port->mFlags = port->mDefFlags;
}
SetRotation(port); SetRotation(port);
return true; return true;
} }