Make this compile on 1.6 and above

5 files changed, 79 insertions, 1 deletions

diff --git a/games/iso-pernangband/distinfo b/games/iso-pernangband/distinfo
index 85f9843e8d3..80c9b13db72 100644
--- a/games/iso-pernangband/distinfo
+++ b/games/iso-pernangband/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/10/21 17:10:14 hubertf Exp $
+$NetBSD: distinfo,v 1.3 2002/06/28 16:03:02 agc Exp $
 
 SHA1 (iso-pern_src-0_2_6.tar.gz) = f71a815e4942dbf59dc6611abf5b538c8a8d1519
 Size (iso-pern_src-0_2_6.tar.gz) = 2432783 bytes
 SHA1 (patch-aa) = d4f09c254e71e1395e8f0968d7bc6478ad3f976c
+SHA1 (patch-ab) = 38c59b5dc94995e14d41efaf18913245095d681c
+SHA1 (patch-ac) = dcb200fafe4d5bcb33a5d4f79611a0c06fdcbd6d
+SHA1 (patch-ad) = 8b61fe17be89749f762b53ce4a59bdcbd7fb1b95
+SHA1 (patch-ae) = 432986b90f9caad12d09213e8609b345490b7cf8
diff --git a/games/iso-pernangband/patches/patch-ab b/games/iso-pernangband/patches/patch-ab
new file mode 100644
index 00000000000..bf905f16a63
--- /dev/null
+++ b/games/iso-pernangband/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.1 2002/06/28 16:03:03 agc Exp $
+
+--- types.h	2002/06/28 15:41:29	1.1
++++ types.h	2002/06/28 15:42:27
+@@ -1562,8 +1562,8 @@
+ };
+ 
+ /* A structure to describe a music. */
+-typedef struct music music;
+-struct music {
++typedef struct music_t music_t;
++struct music_t {
+   char desc[80];          /* Desc of the music */
+   s16b music;             /* Music. */
+   s16b dur;               /* Duration(if any) */
+@@ -1590,8 +1590,8 @@
+ };
+ 
+ /* A structure to describe the fate of the player */
+-typedef struct fate fate;
+-struct fate {
++typedef struct fate_t fate_t;
++struct fate_t {
+         byte fate;      /* Which fate */
+         byte level;     /* On which level */
+         byte serious;   /* Is it sure? */
diff --git a/games/iso-pernangband/patches/patch-ac b/games/iso-pernangband/patches/patch-ac
new file mode 100644
index 00000000000..6685802422a
--- /dev/null
+++ b/games/iso-pernangband/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2002/06/28 16:03:04 agc Exp $
+
+--- externs.h	2002/06/28 15:55:12	1.1
++++ externs.h	2002/06/28 15:55:45
+@@ -78,7 +78,7 @@
+ extern move_info_type move_info[9];
+ extern tactic_info_type tactic_info[9];
+ extern activation activation_info[MAX_T_ACT];
+-extern music music_info[MAX_MUSICS];
++extern music_t music_info[MAX_MUSICS];
+ extern inscription_info_type inscription_info[MAX_INSCRIPTIONS];
+ extern cptr sense_desc[];
+ 
+@@ -459,7 +459,7 @@
+ extern s16b bounties[MAX_BOUNTIES][2];
+ extern random_spell random_spells[MAX_SPELLS];
+ extern s16b spell_num;
+-extern fate fates[MAX_FATES];
++extern fate_t fates[MAX_FATES];
+ extern byte vanilla_town;
+ extern byte dungeon_type;
+ extern byte *spec_history[MAX_DUNGEON_DEPTH];
diff --git a/games/iso-pernangband/patches/patch-ad b/games/iso-pernangband/patches/patch-ad
new file mode 100644
index 00000000000..73292181b08
--- /dev/null
+++ b/games/iso-pernangband/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/06/28 16:03:05 agc Exp $
+
+--- variable.c	2002/06/28 15:56:33	1.1
++++ variable.c	2002/06/28 15:56:52
+@@ -1164,7 +1164,7 @@
+ /*
+  * Fate.
+  */
+-fate fates[MAX_FATES];
++fate_t fates[MAX_FATES];
+ 
+ /*
+  * Vanilla town.
diff --git a/games/iso-pernangband/patches/patch-ae b/games/iso-pernangband/patches/patch-ae
new file mode 100644
index 00000000000..8d6101e2bbc
--- /dev/null
+++ b/games/iso-pernangband/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/06/28 16:03:06 agc Exp $
+
+--- tables.c	2002/06/28 15:57:55	1.1
++++ tables.c	2002/06/28 15:58:10
+@@ -6150,7 +6150,7 @@
+ /*
+  * Possible Musics.
+  */
+-music music_info[MAX_MUSICS] = {
++music_t music_info[MAX_MUSICS] = {
+   {"singing a song of freedom",MUSIC_BETWEEN,10,40,10,1,10},
+   {"singing a charming song",MUSIC_CHARME,6,60,20,1,15},
+   {"singing a knowledge song",MUSIC_ID,6,50,5,2,10},