From accc80ef2f4e7f2f346a8b68f386958acaf23b05 Mon Sep 17 00:00:00 2001
From: Tyrann <tyrann@disenchant.net>
Date: Sun, 23 Sep 2007 21:04:16 +0930
Subject: [PATCH] [PATCH] qbsp: always fix tjunctions, remove option

Signed-off-by: Tyrann <tyrann@disenchant.net>
---
 qbsp/qbsp.c | 9 ++-------
 qbsp/qbsp.h | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/qbsp/qbsp.c b/qbsp/qbsp.c
index 220e19d2..8730f1f7 100644
--- a/qbsp/qbsp.c
+++ b/qbsp/qbsp.c
@@ -113,9 +113,7 @@ ProcessEntity(void)
 		// make the real portals for vis tracing
 		PortalizeWorld(nodes);
 
-		// fix tjunctions
-		if (options.fTjunc)
-		    tjunc(nodes);
+		tjunc(nodes);
 	    }
 	    FreeAllPortals(nodes);
 	}
@@ -295,7 +293,6 @@ PrintOptions(void)
     printf("Quake .BSP files.\n\n");
     printf("qbsp [options] sourcefile [destfile]\n\n");
     printf("Options:\n");
-    printf("   -tjunc          Enables tjunc calculations (default is disabled)\n");
     printf("   -nofill         Doesn't perform outside filling\n");
     printf("   -noclip         Doesn't build clip hulls\n");
     printf("   -onlyents       Only updates .MAP entities\n");
@@ -391,9 +388,7 @@ ParseOptions(char *szOptions)
 	    NameCount++;
 	} else {
 	    szTok++;
-	    if (!strcasecmp(szTok, "tjunc"))
-		options.fTjunc = true;
-	    else if (!strcasecmp(szTok, "nofill"))
+	    if (!strcasecmp(szTok, "nofill"))
 		options.fNofill = true;
 	    else if (!strcasecmp(szTok, "noclip"))
 		options.fNoclip = true;
diff --git a/qbsp/qbsp.h b/qbsp/qbsp.h
index 2eef2745..4a41dd69 100644
--- a/qbsp/qbsp.h
+++ b/qbsp/qbsp.h
@@ -549,7 +549,6 @@ bool FillOutside(node_t *node);
 
 typedef struct options_s {
     bool fNofill;
-    bool fTjunc;
     bool fNoclip;
     bool fOnlyents;
     bool fVerbose;