From d0df4c1744a8b30c147e82b82e1f5a5f27cefc2d Mon Sep 17 00:00:00 2001
From: ZZYZX <ZZYZX@localhost>
Date: Sun, 7 Jun 2015 21:27:20 +0300
Subject: [PATCH] Upgraded the portal code to work with the new tagManager
 system. Was uncompilable

---
 src/p_setup.cpp  | 2 +-
 src/portal.cpp   | 3 ++-
 src/r_things.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 51cbdf76ea..fc31db4112 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1964,7 +1964,7 @@ void P_SetLineID (int i, line_t *ld)
 
 		case Line_SetPortal:
 		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;
 		}
 		if (setid != -1)
diff --git a/src/portal.cpp b/src/portal.cpp
index 0a05e83aec..055603d8cf 100644
--- a/src/portal.cpp
+++ b/src/portal.cpp
@@ -5,6 +5,7 @@
 #include "r_segs.h"
 #include "c_cvars.h"
 #include "m_bbox.h"
+#include "p_tags.h"
 
 // simulation recurions maximum
 CVAR(Int, sv_portal_recursions, 4, CVAR_ARCHIVE|CVAR_SERVERINFO)
@@ -127,7 +128,7 @@ bool P_CheckPortal(line_t* line)
 			{
 				if (&lines[i] == line)
 					continue;
-				if (lines[i].id == line->args[0])
+				if (tagManager.LineHasID(&lines[i], line->args[0]))
 				{
 					dst = &lines[i];
 					break;
diff --git a/src/r_things.cpp b/src/r_things.cpp
index 2aa97f7f06..d5c0489b32 100644
--- a/src/r_things.cpp
+++ b/src/r_things.cpp
@@ -2597,7 +2597,7 @@ void R_DrawParticle (vissprite_t *vis)
 		{
 			DWORD bg = bg2rgb[*dest];
 			bg = (fg+bg) | 0x1f07c1f;
-			*dest = RGB32k[0][0][bg & (bg>>15)];
+			*dest = RGB32k.All[bg & (bg>>15)];
 			dest += spacing;
 		}
 	}