Package: doomsday
Version: 1.14.5-2
Severity: normal
Tags: patch

And hello again,

as per one of my latest patches, the doomsday-compat script defaults
to gamemode=doom2 if nothing else has been specified as an IWAD.
However, we should not take it as granted that the commercial
DOOM2.WAD file is available on each system. Instead, if we find that
neither DOOM2.WAD nor DOOM2F.WAD is available in the specified iwaddir
directory, but FREEDOOM2.WAD is available, we should fall back to
using the latter. This complies with the behaviour of every other Doom
engine that has a list of Doom IWAD files sorted by preference and
usually falls back to using freedoom2.wad if doom2.wad is not
available.

Thanks!

Fabian



-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'experimental'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages doomsday depends on:
ii  libc6                     2.19-18
ii  libfluidsynth1            1.1.6-2
ii  libgcc1                   1:5.1.1-7
ii  libgl1-mesa-glx [libgl1]  10.5.5-1
ii  libqt4-network            4:4.8.6+git155-g716fbae+dfsg-2
ii  libqt4-opengl             4:4.8.6+git155-g716fbae+dfsg-2
ii  libqtcore4                4:4.8.6+git155-g716fbae+dfsg-2
ii  libqtgui4                 4:4.8.6+git155-g716fbae+dfsg-2
ii  libsdl-mixer1.2           1.2.12-11+b1
ii  libsdl1.2debian           1.2.15-11
ii  libstdc++6                5.1.1-7
ii  libx11-6                  2:1.6.3-1
ii  libxrandr2                2:1.4.2-1+b1
ii  libxxf86vm1               1:1.1.4-1
ii  zlib1g                    1:1.2.8.dfsg-2+b1

Versions of packages doomsday recommends:
ii  doom-wad-shareware [doom-wad]  1.9.fixed-2
pn  fluid-soundfont-gm             <none>
ii  freedm [doom-wad]              0.9-1
ii  freedoom [boom-wad]            0.9-1
ii  game-data-packager             41

doomsday suggests no packages.

-- no debconf information
diff --git a/debian/doomsday-compat b/debian/doomsday-compat
index 6efd3eb..998c81d 100755
--- a/debian/doomsday-compat
+++ b/debian/doomsday-compat
@@ -138,6 +138,14 @@ case "$(echo $pwadfile | tr '[:upper:]' '[:lower:]')" in
 		;;
 esac
 
+if [ $gamemode = "doom2" \
+     -a ! -f $iwaddir/doom2.wad \
+     -a ! -f $iwaddir/doom2f.wad \
+     -a -f $iwaddir/freedoom2.wad ]
+then
+	gamemode=freedoom2
+fi
+
 if [ -n "$pwadpath" ]
 then
 	cmdline="-file $pwadpath $cmdline"

Reply via email to