OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Backport r1253 through r1256 and r1259 of GZDoom.

Browse source 
* By pressing request, allow Linux users to build ZDoom with an FMOD version that doesn't give them 3D sound positioning. :p
	* Fixed severe copy-pasta portal copy bug.
	* 3D floors hidden by being moved above the ceiling or below the floor will no longer show in the automap.
	* Reject TEXTURES scale of 0. They'd do nothing but provoke a division by zero error.
	* Maybe fixed Linux compilation?

SVN r3297 (trunk)
This commit is contained in:
Braden Obrzut 2011-09-27 01:14:31 +00:00
commit 9c8bb236ec
5 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/p_spec.cpp
View file

@ -1046,18 +1046,18 @@ void P_SpawnPortal(line_t *line, int sectortag, int plane, int alpha)
{
// Check if this portal needs to be copied to other sectors
// This must be done here to ensure that it gets done only after the portal is set up
if (lines[i].special == Sector_SetPortal &&
lines[i].args[1] == 1 &&
lines[i].args[2] == plane &&
lines[i].args[3] == sectortag)
if (lines[j].special == Sector_SetPortal &&
lines[j].args[1] == 1 &&
lines[j].args[2] == plane &&
lines[j].args[3] == sectortag)
{
if (lines[i].args[0] == 0)
if (lines[j].args[0] == 0)
{
SetPortal(lines[i].frontsector, plane, reference, alpha);
SetPortal(lines[j].frontsector, plane, reference, alpha);
}
else
{
for (int s=-1; (s = P_FindSectorFromTag(lines[i].args[0],s)) >= 0;)
for (int s=-1; (s = P_FindSectorFromTag(lines[j].args[0],s)) >= 0;)
{
SetPortal(&sectors[s], plane, reference, alpha);
}