From 46568382e9f9e3531e84bd089d7807a65a1bce6a Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 17 Jan 2014 04:57:29 +0000 Subject: [PATCH] build: Include sprites in freedoom1.wad for compatibility. The following unused sprites appeared in doom.wad: APBX, APLS, BOSF, MANF. These are Doom 2 sprites. Although unused, they can be (and are) used in mods. Include these in freedoom1.wad for compatibility. This fixes #36. --- buildcfg.txt | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index 60bef117..819d6403 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -1186,10 +1186,6 @@ BOS2L0 34 79 BOS2M0 34 79 BOS2N0 34 79 BOS2O0 34 79 -BOSFA0 15 35 -BOSFB0 16 36 -BOSFC0 17 37 -BOSFD0 17 37 BRS1A0 bspia1d1 ; arachnotron bspia2a8 @@ -1369,16 +1365,7 @@ KEENJ0 14 67 KEENK0 14 67 KEENL0 14 67 KEENM0 14 67 -MANFA1 19 17 -MANFA5 13 15 -MANFA6A4 25 19 -MANFA7A3 34 16 -MANFA8A2 33 17 -MANFB1 19 17 -MANFB5 12 13 -MANFB6B4 18 19 -MANFB7B3 30 17 -MANFB8B2 27 17 + PAINA1 31 63 ; pain elemental PAINA2A8 30 60 PAINA3A7 30 63 @@ -2205,6 +2192,32 @@ SPIDQ0 128 100 SPIDR0 128 100 SPIDS0 128 100 +; The following sprites are technically Doom 2 sprites, but appear +; in doom.wad, and so must be included for compatibility reasons (some +; mods use them): + +APBXA0 12 11 ; Arachnotron plasma ball +APBXB0 19 18 +APBXC0 17 18 +APBXD0 13 13 +APBXE0 0 2 +APLSA0 7 9 +APLSB0 6 8 +BOSFA0 15 35 ; Spinning boss 'cube' +BOSFB0 16 36 +BOSFC0 17 37 +BOSFD0 17 37 +MANFA1 19 17 ; Mancubus shot +MANFA5 13 15 +MANFA6A4 25 19 +MANFA7A3 34 16 +MANFA8A2 33 17 +MANFB1 19 17 +MANFB5 12 13 +MANFB6B4 18 19 +MANFB7B3 30 17 +MANFB8B2 27 17 + ; These are normal items that appear in both Freedoom and FreeDM. AMMOA0 12 16 @@ -2447,13 +2460,6 @@ POB2A0 #endif -APBXA0 12 11 -APBXB0 19 18 -APBXC0 17 18 -APBXD0 13 13 -APBXE0 0 2 -APLSA0 7 9 -APLSB0 6 8 BAL2A0 8 8 BAL2B0 8 8 BAL2C0 16 16