games/jfsw: Update docs, support Twin Dragon.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 33 insertions, 13 deletions

diff --git a/games/jfsw/README b/games/jfsw/README
index e15b0a810e..18e88a389a 100644
--- a/games/jfsw/README
+++ b/games/jfsw/README
@@ -12,13 +12,12 @@ Choices are:
   including the 4 levels from the demo.
 - jfsw_wanton_destruction, the Wanton Destruction expansion pack.
   Includes 12 new levels, plus the 4 levels from the demo.
+- jfsw_twin_dragon, the Twin Dragon expansion pack. Includes 14 new
+  levels, plus the 4 levels from the demo.
 
 Any or all of the game data packages can be installed at the same time
 without conflict.
 
-There is another expansion pack, Twin Dragon, which is not supported
-by jfsw.
-
 If you install the full version of the game, you may also want to install
 jfsw_hires_pack for some graphic enhancements. Don't bother trying if
 all you have is the shareware sw.grp: it segfaults on startup.
diff --git a/games/jfsw/README_music.txt b/games/jfsw/README_music.txt
index 32ff4729c9..f6c44ca5ab 100644
--- a/games/jfsw/README_music.txt
+++ b/games/jfsw/README_music.txt
@@ -16,17 +16,11 @@ Full (Registered) Version, Wanton Destruction expansion
 
 For these versions, jfsw doesn't actually support CD audio from a
 physical CD [*]. It does, however, support .ogg files made from the CD.
-You can use CD ripping software to rip these from the original CD,
-or download them (for free, account creation required) from:
 
-https://www.gog.com/game/shadow_warrior_complete
-
-...or download it from Steam (also for free). The same files are available
-there, under the name "Shadow Warrior Classic".
-
-The .ogg files should be named "track02.ogg" through "track14.ogg", all
-lowercase (there is NO "track01.ogg"!), and placed in either ~/.jfsw/
-or /usr/share/games/jfsw/
+As of April 2020, the jfsw_registered_data build includes the .ogg files,
+so there's no need to rip them from CD or download them separately. If
+you're playing Wanton Destruction, install both jfsw_registered_data
+and jfsw_wanton_destruction.
 
 Run the game, and the music should play. If not, use the in-game menus
 (Options, Sound Menu) to enable the music and turn up the volume.
diff --git a/games/jfsw/jfsw.SlackBuild b/games/jfsw/jfsw.SlackBuild
index 4636f8de50..61c803bc23 100644
--- a/games/jfsw/jfsw.SlackBuild
+++ b/games/jfsw/jfsw.SlackBuild
@@ -156,6 +156,10 @@ patch -p1 < $CWD/patches/sdl1_fix.diff
 # source doesn't like its version number.
 sed -i '/^#error.*Fluid/d' jfaudiolib/src/driver_fluidsynth.c
 
+# 20200428 bkw: add Twin Dragon td.grp to the list of supported GRP
+# files. Need this for the jfsw_twin_dragon build.
+patch -p1 < $CWD/twin_dragon_grp.diff
+
 make \
   RELEASE=1 \
   PREFIX=/usr/share/games/$PRGNAM \
diff --git a/games/jfsw/twin_dragon_grp.diff b/games/jfsw/twin_dragon_grp.diff
new file mode 100644
index 0000000000..1b4a1ce07e
--- /dev/null
+++ b/games/jfsw/twin_dragon_grp.diff
@@ -0,0 +1,23 @@
+diff -Naur jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.c jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.c
+--- jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.c	2017-03-24 23:22:17.000000000 -0400
++++ jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.c	2020-04-28 20:48:40.091365360 -0400
+@@ -34,6 +34,7 @@
+ 	{ "Registered Version",		0x7545319F, 47536148, NULL },
+ 	{ "Shareware Version",		0x08A7FA1F, 26056769, NULL },
+ 	{ "Wanton Destruction (Addon)", 0xA9AAA7B7, 48698128, NULL },
++	{ "Twin Dragon (Addon)", 0xe06cb6b4, 53480783 },
+ };
+ struct grpfile *foundgrps = NULL;
+ 
+diff -Naur jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.h jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.h
+--- jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.h	2017-03-24 23:22:17.000000000 -0400
++++ jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.h	2020-04-28 20:52:36.787343843 -0400
+@@ -25,7 +25,7 @@
+ #define __grpscan_h__
+ 
+ // List of internally-known GRP files
+-#define numgrpfiles 3
++#define numgrpfiles 4
+ struct grpfile {
+ 	const char *name;
+ 	int crcval;