zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- set up portal rotations in the finalizing step, not during initialization. 

Anything earlier may miss some information required to do this correctly.
This commit is contained in:
Christoph Oelckers 2016-06-19 12:40:38 +02:00
parent da05dfa72e
commit 8cf150e68a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/portal.cpp
View File

@ -342,11 +342,6 @@ void P_SpawnLinePortal(line_t* line)
{ {
port->mDefFlags = port->mType == PORTT_VISUAL ? PORTF_VISIBLE : port->mType == PORTT_TELEPORT ? PORTF_TYPETELEPORT : PORTF_TYPEINTERACTIVE; port->mDefFlags = port->mType == PORTT_VISUAL ? PORTF_VISIBLE : port->mType == PORTT_TELEPORT ? PORTF_TYPETELEPORT : PORTF_TYPEINTERACTIVE;
} }
// Get the angle between the two linedefs, for rotating
// orientation and velocity. Rotate 180 degrees, and flip
// the position across the exit linedef, if reversed.
SetRotation(port);
} }
else if (line->args[2] == PORTT_LINKEDEE && line->args[0] == 0) else if (line->args[2] == PORTT_LINKEDEE && line->args[0] == 0)
{ {
@ -367,7 +362,6 @@ void P_SpawnLinePortal(line_t* line)
port->mType = PORTT_LINKED; port->mType = PORTT_LINKED;
port->mAlign = PORG_ABSOLUTE; port->mAlign = PORG_ABSOLUTE;
port->mDefFlags = PORTF_TYPEINTERACTIVE; port->mDefFlags = PORTF_TYPEINTERACTIVE;
SetRotation(port);
// we need to create the backlink here, too. // we need to create the backlink here, too.
lines[i].portalindex = linePortals.Reserve(1); lines[i].portalindex = linePortals.Reserve(1);
@ -379,8 +373,6 @@ void P_SpawnLinePortal(line_t* line)
port->mType = PORTT_LINKED; port->mType = PORTT_LINKED;
port->mAlign = PORG_ABSOLUTE; port->mAlign = PORG_ABSOLUTE;
port->mDefFlags = PORTF_TYPEINTERACTIVE; port->mDefFlags = PORTF_TYPEINTERACTIVE;
SetRotation(port);
} }
} }
} }
@ -430,6 +422,9 @@ void P_UpdatePortal(FLinePortal *port)
} }
} }
} }
// Cache the angle between the two linedefs, for rotating.
SetRotation(port);
} }
//============================================================================ //============================================================================