NetBSD merge (mainly -Wall related)

1 files changed, 46 insertions, 42 deletions

diff --git a/games/phantasia/phantglobs.c b/games/phantasia/phantglobs.c
index ff3abcd0704..d29d2faa782 100644
--- a/games/phantasia/phantglobs.c
+++ b/games/phantasia/phantglobs.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: phantglobs.c,v 1.3 1998/11/29 19:57:01 pjanzen Exp $	*/
 /*	$NetBSD: phantglobs.c,v 1.2 1995/03/24 03:59:33 cgd Exp $	*/
 
 /*
@@ -32,7 +33,7 @@ jmp_buf Timeoenv;	/* used for timing out waiting for input	*/
 
 long	Fileloc;	/* location in file of player statistics	*/
 
-char	*Login;		/* pointer to login of player			*/
+const char *Login;	/* pointer to login of player			*/
 char	*Enemyname;	/* pointer name of monster/player we are battling*/
 
 struct	player	Player;	/* stats for player				*/
@@ -45,62 +46,65 @@ struct	energyvoid Enrgyvoid;/* energy void buffer			*/
 struct	charstats *Statptr;/* pointer into Stattable[]			*/
 
 /* lookup table for character type dependent statistics */
-struct	charstats Stattable[7] =
-	{
+struct	charstats Stattable[7] = {
 	/* MAGIC USER */
-	/* max brains, max mana, weakness, gold tote, ring duration */
-	15.0, 200.0, 18.0, 175.0, 10,
-	/* quickness strength     mana         energy       brains       magic lvl */
-	30, 6, 0.0,  10, 6, 2.0,  50,51,75.0,  30,16,20.0,  60,26, 6.0,	 5, 5,2.75,
+	{
+		15.0, 200.0, 18.0, 175.0, 10,
+			{30, 6, 0.0},	{10, 6, 2.0},	{50, 51, 75.0},
+			{30, 16, 20.0},	{60, 26, 6.0},	{5, 5, 2.75}
+	},
 
 	/* FIGHTER */
-	/* max brains, max mana, weakness, gold tote, ring duration */
-	10.0, 110.0, 15.0, 220.0, 20,
-	/* quickness strength     mana         energy       brains       magic lvl */
-	30, 6, 0.0,  40,16, 3.0,  30,21,40.0,  45,26,30.0,  25,21, 3.0,	 3, 4, 1.5,
+	{
+		10.0, 110.0, 15.0, 220.0, 20,
+			{30, 6, 0.0},	{40, 16, 3.0},	{30, 21, 40.0},
+			{45, 26, 30.0},	{25, 21, 3.0},	{3, 4, 1.5}
+	},
 
 	/* ELF */
-	/* max brains, max mana, weakness, gold tote, ring duration */
-	12.0, 150.0, 17.0, 190.0, 13,
-	/* quickness strength     mana         energy       brains       magic lvl */
-	32, 7, 0.0,  35,11, 2.5,  45,46,65.0,  30,21,25.0,  40,26, 4.0,	 4, 4, 2.0,
+	{
+		12.0, 150.0, 17.0, 190.0, 13,
+			{32, 7, 0.0},	{35, 11, 2.5},	{45, 46, 65.0},
+			{30, 21, 25.0},	{40, 26, 4.0},	{4, 4, 2.0}
+	},
 
 	/* DWARF */
-	/* max brains, max mana, weakness, gold tote, ring duration */
-	7.0, 80.0, 13.0, 255.0,  25,
-	/* quickness strength     mana         energy       brains       magic lvl */
-	25, 6, 0.0,  50,21, 5.0,  25,21,30.0,  60,41,35.0,  20,21, 2.5,	 2, 4, 1.0,
+	{	 7.0, 80.0, 13.0, 255.0,  25,
+			{25, 6, 0.0},	{50, 21, 5.0},	{25, 21, 30.0},
+			{60, 41, 35.0},	{20, 21, 2.5},	{2, 4, 1.0}
+	},
 
 	/* HALFLING */
-	/* max brains, max mana, weakness, gold tote, ring duration */
-	11.0, 80.0, 10.0, 125.0, 40,
-	/* quickness strength     mana         energy       brains       magic lvl */
-	34, 0, 0.0,  20, 6, 2.0,  25,21,30.0,  55,36,30.0,  40,36, 4.5,	 1, 4, 1.0,
+	{
+		11.0, 80.0, 10.0, 125.0, 40,
+			{34, 0, 0.0},	{20, 6, 2.0},	{25, 21, 30.0},
+			{55, 36, 30.0},	{40, 36, 4.5},	{1, 4, 1.0}
+	},
 
 	/* EXPERIMENTO */
-	/* max brains, max mana, weakness, gold tote, ring duration */
-	9.0, 90.0, 16.0, 160.0, 20,
-	/* quickness strength     mana         energy       brains       magic lvl */
-	27, 0, 0.0,  25, 0, 0.0,  100,0, 0.0,  35, 0, 0.0,  25, 0, 0.0,	 2, 0, 0.0,
+	{	 9.0, 90.0, 16.0, 160.0, 20,
+			{27, 0, 0.0},	{25, 0, 0.0},	{100, 0, 0.0},
+			{35, 0, 0.0},	{25, 0, 0.0},	{2, 0, 0.0}
+	},
 
 	/* SUPER */
-	/* max brains, max mana, weakness, gold tote, ring duration */
-	15.0, 200.0, 10.0, 225.0, 40,
-	/* quickness strength     mana         energy       brains       magic lvl */
-	38, 0, 0.0,  65, 0, 5.0,  100,0,75.0,  80, 0,35.0,  85, 0, 6.0,	 9, 0,2.75
-	};
+	{
+		15.0, 200.0, 10.0, 225.0, 40,
+			{38, 0, 0.0},	{65, 0, 5.0},	{100, 0, 75.0},
+			{80, 0, 35.0},	{85, 0, 6.0},	{9, 0, 2.75}
+	}
+};
 
 /* menu of items for purchase */
-struct menuitem	Menu[] =
-    {
-    "Mana", 1,
-    "Shield", 5,
-    "Book", 200,
-    "Sword", 500,
-    "Charm", 1000,
-    "Quicksilver", 2500,
-    "Blessing", 1000,
-    };
+struct menuitem	Menu[] = {
+	{"Mana", 1},
+	{"Shield", 5},
+	{"Book", 200},
+	{"Sword", 500},
+	{"Charm", 1000},
+	{"Quicksilver", 2500},
+	{"Blessing", 1000},
+};
 
 FILE	*Playersfp;	/* pointer to open player file			*/
 FILE	*Monstfp;	/* pointer to open monster file			*/