Merge branch 'vile-redo' of gh:NickZ/freedoom

BUILD-SYSTEM.adoc

@@ -262,11 +262,6 @@ around.  Some of them are listed here.
    “standard” background color of cyan is used instead by providing
    the +-rgb 0 255 255+ command line parameter.
 
- * By default, deutex attempts to convert sound effects to 11,025Hz
-   format.  To keep the existing sample rate of sound effects, the
-   following command line parameters are provided:
-   +-v0 -fullsnd -rate accept+
-
  * deutex does not allow the exact path to the +texture1.txt+ file to
    be specified in the configuration file; this used to be a problem
    but the Freedoom's texture lumps are now built using a custom

COMPILING.adoc

@@ -26,14 +26,17 @@ Building the Freedoom IWADs pretty much simply requires the following:
   * 'Python': Freedoom uses several Python programs in its tree to
     assist with building the IWADs.  Both Python 2.7 and 3.x are fully
     supported.
-  * 'DeuTex' 4.4.902: Freedoom depends on some features not present in
-    the last official release, 4.4.0.  Development of DeuTex,
-    unfortunately, appears to have ceased and is presently abandoned.
-    Debian includes 4.4.902 in its software repository, while Fedora
-    has only 4.4.0.  If your distribution does not provide 4.4.902, it
-    is recommended to use Mike Swanson's unofficial
+  * 'DeuTex' 5.0.0: freedoom now requires Deutex 5.0.0.
+    This version is fairly new, and distributions have not yet had the
+    chance to update their packages.
+    If your distribution does not provide 5.0.0, it
+    is recommended to use Mike Swanson's 
     https://github.com/Doom-Utils/deutex[repository], the master branch of
-    which includes 4.4.902 and some additional patches.
+    which includes 5.0.0. You may also make use of the Windows binaries provided
+    on the official release page 
+    https://github.com/Doom-Utils/deutex/releases[here],
+    or the Ubuntu PPA 
+    https://launchpad.net/~nzatkovich/+archive/ubuntu/deutex[here].
 
 All or most of this software should already be available in your
 operating system's software repository, with the likely exception of

Makefile

@@ -4,7 +4,7 @@ VERSION=$(shell git describe --dirty 2>/dev/null || cat VERSION)
 WADS=wads
 CPP=scripts/simplecpp
 DEUTEX=deutex
-DEUTEX_BASIC_ARGS=-v0 -fullsnd -rate accept -rgb 0 255 255
+DEUTEX_BASIC_ARGS=-v0 -rate accept -rgb 0 255 255
 DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
 
 FREEDOOM1=$(WADS)/freedoom1.wad

scripts/wadinfo-builder.py

@@ -91,7 +91,7 @@ def parse_assignment(section, line, match):
 	if override is not None:
 		filename = find_file(section, override.lower())
 	else:
-		filename = find_file(section, resource.replace('[', '$').replace(']', '#').replace('\\', '@'))
+		filename = find_file(section, resource.replace('\\', '^'))
 
 	# File not found?