Remove the #ifdef FREEDM section that makes all monsters appear as a
black silhouette. This leaves sprites/{blank,nomonst}.gif unused.
I believe the plan is that FreeDM will become a vanilla-compatible IWAD
that the user can use with Chocolate Doom to play single player vanilla
maps, so real monsters are needed in it.
Signed-off-by: RjY <rjy@users.sourceforge.net>
With shareware gone, only Doom2 and Ultdoom remain, and in particular
there is no non-Ultdoom Doom1 target. Therefore #ifdef ULTDOOM sections
inside #ifndef DOOM2 sections are just extra clutter.
Signed-off-by: RjY <rjy@users.sourceforge.net>
I found this checking for duplicate lumps in the built IWADs.
It wasn't used as the "real" D_E3M4 overrode it.
Signed-off-by: RjY <rjy@users.sourceforge.net>
This was a lot easier to do without having to worry about shareware!
Thanks to Sodaholic for reporting:
http://www.doomworld.com/vb/post/952575
Signed-off-by: RjY <rjy@users.sourceforge.net>
Consensus that the "shareware" target was no longer necessary was
reached long ago[1]. It just needs to actually get done. Thus:
Makefile:
- remove shareware targets
buildcfg.txt, textures/combined.txt:
- remove #ifdef/#ifndef SHAREWARE sections (almost entirely #ifndef)
graphics/help2.gif:
- remove symlink, help2 screen was shareware-only
gitignore:
- remove shareware files no longer built
textures/shareware:
- remove directory
--
[1] http://www.doomworld.com/vb/freedoom/52758-removing-shareware/ .
In particular, Jon wrote:
>The original purpose of the shareware IWAD was to have a smaller set of
>resources to target 100% completion of. That was probably met a long
>time ago.
More recently chungy wrote in <http://www.doomworld.com/vb/post/957707>
>Removing the "demo"/"shareware" version of Freedoom has been discussed
>but it's never been done. Actually it's a bit easier to just leave it
>in than to remove it. (It'd be pretty easy to get rid of it anyway, but
>nothing is really gained from it)
Signed-off-by: RjY <rjy@users.sourceforge.net>
Link d_inter and d_bunny to nb_nmare/n_ampie.mus. Still both
placeholders. See also http://www.doomworld.com/vb/post/960466
Signed-off-by: RjY <rjy@users.sourceforge.net>
- stop confusing F and S:
- F is filename of subdirectory (lower case, no spaces)
- S is screen name (mixed case, possible spaces)
- if a field is empty, remove it completely.
Signed-off-by: RjY <rjy@users.sourceforge.net>
delete sidedefless lines 781, 791
these can potentially crash the game although they were in the void
allow door out of first room to open
set linedefs 21, 61 to type 1 manual door
set passuse on line 131 for completeness' sake
fix secret area entrance
sector 93 and linedef 394 have tag 12
remove special from linedef 457 (not needed)
fix lift up to red key (sector 115)
set tag 13, also linedefs 559, 562
fix lifts in penultimate area, after red key teleporter
sector 132 and linedefs 666, 680 have tag 14
sector 133 and linedefs 623, 661 have tag 15
change hanging body (thing 73) to non-blocking version
fix secret area count
mark sector 94 as a proper secret for which you get credit
remove spurious tag 7 from sectors 127-129
cosmetic fixes
stop secret area entrance tracks descending with floor
clear lower unpegged flag on linedefs 456, 458
fix alignment of wall behind lift up to red key (linedef 562)
prevent walls under crushers in final area from moving with ceiling
set lower unpegging flag on linedefs 747, 752, 754
fix various misaligned STONE2 ugliness in final room
Signed-off-by: RjY <rjy@users.sourceforge.net>
This patch fixes a long-standing bug where the first three Doom1 sky
textures used the Doom2 sky patches, giving them the wrong appearance.
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
solid hanging corpses made non-blocking
- 27 and 28 blocked a player attempting to hurl himself off
the red key platform.
- 152 was an irritatingly invisible blockage in the final corridor.
Unfortunately Freedoom's version of this sprite is a lot smaller
than Doom's.
- 68 and 119 are mostly cosmetic, but fix them anyway.
fake manual zdoomisms fixed
- linedefs 492, 493: the drawbridge already has a tag 5, set its sides
to have the same tag.
- give linedef 194 and sector 10 tag 14 so the red key platform sinks
into the lava correctly.
- give linedefs 116 and 118 and sector 11 tag 15, so you can get out
of the lava after said platform has sunk.
incorrect door track pegging fixed (linedefs 817, 819)
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
Catoptromancy writes in <http://www.doomworld.com/vb/post/949221>:
>This should be updated to map24 [...] The current 0.7 map24 is actually
>a brand new udoom map I swapped in since mine was far from finished.
Reset map24 symlink back to catoptromancy/map24.wad
(Partially reverts 0c4144eba0)
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
Catoptromancy writes in <http://www.doomworld.com/vb/post/949221>
> Also map19 from dabski needs relinked, was removed for release due to
> error and not finished.
This reverts commit 3b76d63ecd.
Signed-off-by: RjY <rjy@users.sourceforge.net>
CC: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
In map02 (siggi/hawl.wad) the exit sign is lit up, but the ground
beneath it is kept dark by using vanilla shadowcasting effects.
BondEar reported evidence of slime trails around the exit sign[1]. I
couldn't verify this, but nevertheless here is an attempt to fix it.
Uses linedef 254 as the control linedef rather than creating a whole
new control sector, to avoid an unnecessary node rebuild which would
break Catoptromancy's demo pack :-)
[1] http://www.doomworld.com/vb/post/940478
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
It's a bit hard to see given the flat format of buildcfg.txt but we need
to do this:
if doom2
include demo{1,2,3}_d2
else
include demo1_ud // both shareware and ultdoom
if ultdoom
include demo{2,3,4}_ud
endif
endif
The previous code had doom2 and ultdoom separately and always included
an unsourced demo2 and demo3, which was breaking the ultdoom IWAD.
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
Boom only recognises texture names as colormaps names on certain line
specials (e.g. 242, deep water) If a colormap name is used on any other
kind of special (or non-special) line the name is interpreted as a
texture as normal, and Boom202 cannot cope with unknown textures.
Thus, remove the lower texture MFADEMAP from linedef 2328 of map09.
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
In particular: dspodth1, dspodth2, dspodth3, dspopain,
dsposact, dsposit1, dsposit2, dsposit3, dspunch, dsslop.
Thanks to RottKing, especially for his patience!
[ RjY: I've left behind the original dsslop as it is
still used as the demon (worm) death sound - if the
new one should be used for both, please update ]
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
Python 3 makes a number of changes to the language and breaks backward
compatibility with Python 2 in some places. This change updates the
Python scripts used in the build system to work with Python 3,
although the updated scripts still run in Python 2 as well. Most of
the changes are minor; the biggest changes are to the palette /
colormap generation scripts.
Signed-off-by: Simon Howard <fraggle@gmail.com>
Full consistency for Doom II levels, Final Doom compatibility but
some visual inconsistencies for Final Doom PWADs (eg, Plutonia 2).
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
The commit referenced was from prior to the history-rewrite and
no longer was a real commit in the repository.
Also, asciidoc had some formatting error in the "Submitting your
work" section where a large chungy of text was being rendered as
monospace in the HTML version. To fix this, "git commit -s" is
surrounded by +s rather than `s.
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
