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

Upgraded the portal code to work with the new tagManager system. Was uncompilable

Browse source
This commit is contained in:
ZZYZX 2015-06-07 21:27:20 +03:00
parent 31cad858d9
commit d0df4c1744
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.cpp
View file

@ -1964,7 +1964,7 @@ void P_SetLineID (int i, line_t *ld)
case Line_SetPortal: case Line_SetPortal:
case Line_SetVisualPortal: case Line_SetVisualPortal:
ld->id = 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;
} }
if (setid != -1) if (setid != -1)

3
src/portal.cpp
View file

@ -5,6 +5,7 @@
#include "r_segs.h" #include "r_segs.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "m_bbox.h" #include "m_bbox.h"
#include "p_tags.h"
// simulation recurions maximum // simulation recurions maximum
CVAR(Int, sv_portal_recursions, 4, CVAR_ARCHIVE|CVAR_SERVERINFO) CVAR(Int, sv_portal_recursions, 4, CVAR_ARCHIVE|CVAR_SERVERINFO)
@ -127,7 +128,7 @@ bool P_CheckPortal(line_t* line)
{ {
if (&lines[i] == line) if (&lines[i] == line)
continue; continue;
if (lines[i].id == line->args[0]) if (tagManager.LineHasID(&lines[i], line->args[0]))
{ {
dst = &lines[i]; dst = &lines[i];
break; break;

2
src/r_things.cpp
View file

@ -2597,7 +2597,7 @@ void R_DrawParticle (vissprite_t *vis)
{ {
DWORD bg = bg2rgb[*dest]; DWORD bg = bg2rgb[*dest];
bg = (fg+bg) | 0x1f07c1f; bg = (fg+bg) | 0x1f07c1f;
*dest = RGB32k[0][0][bg & (bg>>15)]; *dest = RGB32k.All[bg & (bg>>15)];
dest += spacing; dest += spacing;
} }
} }