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

- fixed: line portal rotations were not set for all types.

This commit is contained in:
Christoph Oelckers 2016-03-04 14:09:26 +01:00
parent 9b23b41021
commit b427f27e3b
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/portal.cpp
View File

@ -224,6 +224,23 @@ static line_t *FindDestination(line_t *src, int tag)
return NULL;
}
//============================================================================
//
//
//
//============================================================================
static void SetRotation(FLinePortal *port)
{
line_t *dst = port->mDestination;
line_t *line = port->mOrigin;
double angle = atan2(dst->dy, dst->dx) - atan2(line->dy, line->dx) + M_PI;
port->mSinRot = FLOAT2FIXED(sin(angle));
port->mCosRot = FLOAT2FIXED(cos(angle));
port->mAngleDiff = RAD2ANGLE(angle);
}
//============================================================================
//
// Spawns a single line portal
@ -270,12 +287,7 @@ void P_SpawnLinePortal(line_t* line)
// 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.
double angle = atan2(dst->dy, dst->dx) - atan2(line->dy, line->dx) + M_PI;
port->mSinRot = FLOAT2FIXED(sin(angle));
port->mCosRot = FLOAT2FIXED(cos(angle));
port->mAngleDiff = RAD2ANGLE(angle);
SetRotation(port);
}
else if (line->args[2] == PORTT_LINKEDEE && line->args[0] == 0)
{
@ -296,6 +308,7 @@ void P_SpawnLinePortal(line_t* line)
port->mType = PORTT_LINKED;
port->mAlign = PORG_ABSOLUTE;
port->mDefFlags = PORTF_TYPEINTERACTIVE;
SetRotation(port);
// we need to create the backlink here, too.
lines[i].portalindex = linePortals.Reserve(1);
@ -308,6 +321,7 @@ void P_SpawnLinePortal(line_t* line)
port->mAlign = PORG_ABSOLUTE;
port->mDefFlags = PORTF_TYPEINTERACTIVE;
SetRotation(port);
}
}
}
@ -427,9 +441,10 @@ static bool ChangePortalLine(line_t *line, int destid)
else
{
port->mFlags = port->mDefFlags;
portd->mFlags = portd->mDefFlags;
}
SetRotation(portd);
}
SetRotation(port);
return true;
}