From 3877a213a00a669fb7b4491326e63f7093406070 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 9 Aug 2015 13:32:43 -0600 Subject: [PATCH] qbsp: use -oldaxis by default --- man/qbsp.1 | 8 +++++--- qbsp/qbsp.c | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/man/qbsp.1 b/man/qbsp.1 index f439122a..93596da5 100644 --- a/man/qbsp.1 +++ b/man/qbsp.1 @@ -37,8 +37,10 @@ Computes portal information for transparent water (default) Computes portal information for opaque water .IP "\fB\-transsky\fP" Computes portal information for transparent sky -.IP "\fB\-oldaxis\fP" -Uses original qbsp texture alignment algorithm +.IP "\fB\-nooldaxis\fP" +Use alternate texture alignment algorithm. The default is to use the original +QBSP texture alignment algorithm, which required the -oldaxis switch in +tyrutils-ericw v0.15.1 and earlier. .IP "\fB\-forcegoodtree\fP (experimental)" Force use of expensive processing for SolidBSP stage. Often results in a more optimal BSP file in terms of file size, at the expense of @@ -64,7 +66,7 @@ Use different texture subdivision (default 240) Search this directory for wad files (default is cwd) .IP "\fB\-oldrottex\fP" Use old method of texturing rotate_ brushes where the mapper aligns -textures for the object at (0 0 0). +textures for the object at (0 0 0). .SH "SPECIAL TEXTURE NAMES" .PP diff --git a/qbsp/qbsp.c b/qbsp/qbsp.c index 613c4080..3a1f84f8 100644 --- a/qbsp/qbsp.c +++ b/qbsp/qbsp.c @@ -452,6 +452,7 @@ ParseOptions(char *szOptions) options.BSPVersion = BSPVERSION; options.fTranswater = true; options.fixRotateObjTexture = true; + options.fOldaxis = true; szEnd = szOptions + strlen(szOptions); szTok = GetTok(szOptions, szEnd); @@ -486,7 +487,9 @@ ParseOptions(char *szOptions) else if (!strcasecmp(szTok, "transsky")) options.fTranssky = true; else if (!strcasecmp(szTok, "oldaxis")) - options.fOldaxis = true; + logprint("-oldaxis is now the default and the flag is ignored.\nUse -nooldaxis to get the alternate behaviour.\n"); + else if (!strcasecmp(szTok, "nooldaxis")) + options.fOldaxis = false; else if (!strcasecmp(szTok, "forcegoodtree")) options.forceGoodTree = true; else if (!strcasecmp(szTok, "bspleak"))