Fix nested comments for -Wcomment warnings.

12 files changed, 83 insertions, 83 deletions

diff --git a/games/adventure/init.c b/games/adventure/init.c
index 77a948a..137f3c8 100644
--- a/games/adventure/init.c
+++ b/games/adventure/init.c
@@ -207,7 +207,7 @@ startup()
 
 	demo=Start(0);
 	srand((int)(time((time_t *)NULL)));	/* random seed */
-	/* srand(371);				/* non-random seed */
+	/* srand(371); */			/* non-random seed */
 	hinted[3]=yes(65,1,0);
 	newloc=1;
 	delhit = 0;
diff --git a/games/hack/hack.do_name.c b/games/hack/hack.do_name.c
index 72ac62c..bc49510 100644
--- a/games/hack/hack.do_name.c
+++ b/games/hack/hack.do_name.c
@@ -129,7 +129,7 @@ char buf[BUFSZ];
 			break;
 		}
 	}
-	/* obfree(obj, otmp2);	/* now unnecessary: no pointers on bill */
+	/*obfree(obj, otmp2);*/	/* now unnecessary: no pointers on bill */
 	free((char *) obj);	/* let us hope nobody else saved a pointer */
 }
 
diff --git a/games/hack/hack.mon.c b/games/hack/hack.mon.c
index b31c159..f89b3a8 100644
--- a/games/hack/hack.mon.c
+++ b/games/hack/hack.mon.c
@@ -132,7 +132,7 @@ char *name;
 		u.uhp = -1;
 	}
 	if(u.uhp < 1) done_in_by(mtmp);
-	/* flags.botlx = 1;		/* should we show status line ? */
+	/* flags.botlx = 1; */		/* should we show status line ? */
 }
 
 dochugw(mtmp) register struct monst *mtmp; {
diff --git a/games/hack/hack.unix.c b/games/hack/hack.unix.c
index 03b294d..7e84c0c 100644
--- a/games/hack/hack.unix.c
+++ b/games/hack/hack.unix.c
@@ -92,11 +92,11 @@ struct stat buf, hbuf;
 gethdate(name) char *name; {
 /* old version - for people short of space */
 /*
-/* register char *np;
-/*	if(stat(name, &hbuf))
-/*		error("Cannot get status of %s.",
-/*			(np = rindex(name, '/')) ? np+1 : name);
-/*
+ * register char *np;
+ *	if(stat(name, &hbuf))
+ *		error("Cannot get status of %s.",
+ *			(np = rindex(name, '/')) ? np+1 : name);
+ */
 /* version using PATH from: seismo!gregc@ucsf-cgl.ARPA (Greg Couch) */
 
 
@@ -161,8 +161,8 @@ veryold(fd) {
 			/* strange ... */
 			return(0);
 
-		/* From: Rick Adams <seismo!rick>
-		/* This will work on 4.1cbsd, 4.2bsd and system 3? & 5.
+		/* From: Rick Adams <seismo!rick> */
+		/* This will work on 4.1cbsd, 4.2bsd and system 3? & 5. */
 		/* It will do nothing on V7 or 4.1bsd. */
 		if(!(kill(lockedpid, 0) == -1 && errno == ESRCH))
 			return(0);
diff --git a/games/larn/main.c b/games/larn/main.c
index dbe0c89..36c1665 100644
--- a/games/larn/main.c
+++ b/games/larn/main.c
@@ -202,7 +202,7 @@ main(argc,argv)
 	drawscreen();	/*	show the initial dungeon					*/
 	predostuff = 2;	/* tell the trap functions that they must do a showplayer()
 						from here on */
-	/* nice(1);	/* games should be run niced */
+	/* nice(1); */	/* games should be run niced */
 	yrepcount = hit2flag = 0;
 	while (1)
 		{
diff --git a/games/phantasia/fight.c b/games/phantasia/fight.c
index 4038d1d..39858c9 100644
--- a/games/phantasia/fight.c
+++ b/games/phantasia/fight.c
@@ -32,7 +32,7 @@
 /	Arbitrate between monster and player.  Watch for either
 /	dying.
 /
-/************************************************************************/
+*************************************************************************/
 
 encounter(particular)
 int	particular;
@@ -209,7 +209,7 @@ int	flockcnt = 1;			/* how many time flocked */
 /	is altered (to add monsters, or make them tougher), this
 /	routine may also need to be changed.
 /
-/************************************************************************/
+*************************************************************************/
 
 pickmonster()
 {
@@ -265,7 +265,7 @@ pickmonster()
 / DESCRIPTION:
 /	Process all monster battle options.
 /
-/************************************************************************/
+*************************************************************************/
 
 playerhits()
 {
@@ -443,7 +443,7 @@ int	ch;		/* input */
 /	Handle all special monsters here.  If the monster is not a special
 /	one, simply roll a hit against the player.
 /
-/************************************************************************/
+*************************************************************************/
 
 monsthits()
 {
@@ -720,7 +720,7 @@ SPECIALHIT:
 /	Clear current monster's energy, experience, treasure type, and
 /	flock.  This is the same as having the monster run away.
 /
-/************************************************************************/
+*************************************************************************/
 
 cancelmonster()
 {
@@ -753,7 +753,7 @@ cancelmonster()
 /	Hit monster specified number of times.  Handle when monster dies,
 /	and a few special monsters.
 /
-/************************************************************************/
+*************************************************************************/
 
 hitmonster(inflict)
 double	inflict;
@@ -808,7 +808,7 @@ double	inflict;
 / DESCRIPTION:
 /	Prompt player and process magic spells.
 /
-/************************************************************************/
+*************************************************************************/
 
 throwspell()
 {
@@ -1048,7 +1048,7 @@ int	ch;		/* input */
 /	Adjust statistics based upon current size.
 /	Handle some special monsters.
 /
-/************************************************************************/
+*************************************************************************/
 
 callmonster(which)
 int	which;
@@ -1158,7 +1158,7 @@ struct monster	Othermonster;		/* to find a name for mimics */
 /	certain player statistics.
 /	Handle cursed treasure.
 /
-/************************************************************************/
+*************************************************************************/
 
 awardtreasure()
 {
@@ -1606,7 +1606,7 @@ double	dtemp;				/* for temporary calculations */
 /	Handle cursed treasure.  Look for amulets and charms to save
 /	the player from the curse.
 /
-/************************************************************************/
+*************************************************************************/
 
 cursedtreasure()
 {
@@ -1648,7 +1648,7 @@ cursedtreasure()
 / DESCRIPTION:
 /	Swap a few player statistics randomly.
 /
-/************************************************************************/
+*************************************************************************/
 
 scramblestats()
 {
diff --git a/games/phantasia/gamesupport.c b/games/phantasia/gamesupport.c
index c7481ef7..db103a1 100644
--- a/games/phantasia/gamesupport.c
+++ b/games/phantasia/gamesupport.c
@@ -48,7 +48,7 @@
 /	    - another player structure would be necessary to check for names
 /	      already in use
 /
-/************************************************************************/
+*************************************************************************/
 
 changestats(ingameflag)
 bool	ingameflag;
@@ -508,7 +508,7 @@ BALTER:
 / DESCRIPTION:
 /	Read monster file, and print a monster listing on standard output.
 /
-/************************************************************************/
+*************************************************************************/
 
 monstlist()
 {
@@ -544,7 +544,7 @@ register int 	count = 0;		/* count in file */
 / DESCRIPTION:
 /	Read the scoreboard file and print the contents.
 /
-/************************************************************************/
+*************************************************************************/
 
 scorelist()
 {
@@ -581,7 +581,7 @@ register FILE	*fp;		/* to open the file */
 / DESCRIPTION:
 /	Read player file, and print list of active records to standard output.
 /
-/************************************************************************/
+*************************************************************************/
 
 activelist()
 {
@@ -618,7 +618,7 @@ activelist()
 /	Delete characters which have not been used with the last
 /	three weeks.
 /
-/************************************************************************/
+*************************************************************************/
 
 purgeoldplayers()
 {
@@ -674,7 +674,7 @@ long	loc = 0L;	/* location in file */
 /	if an entry is found, and it is lower than the current player,
 /	replace it, otherwise create an entry.
 /
-/************************************************************************/
+*************************************************************************/
 
 enterscore()
 {
diff --git a/games/phantasia/interplayer.c b/games/phantasia/interplayer.c
index 0c923f0..adc7e1b 100644
--- a/games/phantasia/interplayer.c
+++ b/games/phantasia/interplayer.c
@@ -27,7 +27,7 @@
 /	current player.
 /	Also update user count.
 /
-/************************************************************************/
+*************************************************************************/
 
 checkbattle()
 {
@@ -104,7 +104,7 @@ long	foeloc = 0L;		/* location in file of person to fight */
 /	    p_1scratch:
 /		set to total damage inflicted so far; changes to indicate action
 /
-/************************************************************************/
+*************************************************************************/
 
 battleplayer(foeplace)
 long	foeplace;
@@ -359,7 +359,7 @@ LEAVE:
 /	Take action action against foe, and decide who is master
 /	for next iteration.
 /
-/************************************************************************/
+*************************************************************************/
 
 myturn()
 {
@@ -467,7 +467,7 @@ HIT:
 /	Check for energy voids, holy grail, and tampering by other
 /	players.
 /
-/************************************************************************/
+*************************************************************************/
 
 checktampered()
 {
@@ -528,7 +528,7 @@ long	loc = 0L;		/* location in energy void file */
 /	Take care of energy voids, holy grail, decree and intervention
 /	action on current player.
 /
-/************************************************************************/
+*************************************************************************/
 
 tampered(what, arg1, arg2)
 int	what;
@@ -725,7 +725,7 @@ long	loc;			/* location in file of other players */
 /	The valar has no coordinates, and is completely invisible if
 /	cloaked.
 /
-/************************************************************************/
+*************************************************************************/
 
 userlist(ingameflag)
 bool	ingameflag;
@@ -820,7 +820,7 @@ register int	numusers = 0;	/* number of users on file */
 /	Clear energy voids with new king.
 /	Print 'decree' prompt.
 /
-/************************************************************************/
+*************************************************************************/
 
 throneroom()
 {
@@ -902,7 +902,7 @@ long	loc = 0L;		/* location of old king in player file */
 / DESCRIPTION:
 /	Tamper with other players.  Handle king/valar specific options.
 /
-/************************************************************************/
+*************************************************************************/
 
 dotampered()
 {
@@ -1154,7 +1154,7 @@ FILE	*fp;				/* for opening gold file */
 / DESCRIPTION:
 /	Write out energy void structure at specified location.
 /
-/************************************************************************/
+*************************************************************************/
 
 writevoid(vp, loc)
 register struct energyvoid	*vp;
@@ -1190,7 +1190,7 @@ long	loc;
 /	location.
 /	If no inactive ones are found, return one more than last location.
 /
-/************************************************************************/
+*************************************************************************/
 
 long
 allocvoid()
diff --git a/games/phantasia/io.c b/games/phantasia/io.c
index addf1c9..8a0a614 100644
--- a/games/phantasia/io.c
+++ b/games/phantasia/io.c
@@ -37,7 +37,7 @@
 /
 /	'mx' is assumed to be at least 2.
 /
-/************************************************************************/
+*************************************************************************/
 
 getstring(cp, mx)
 register char	*cp;
@@ -113,7 +113,7 @@ int	ch;			/* input */
 / DESCRIPTION:
 /	Print a message, and wait for a space character.
 /
-/************************************************************************/
+*************************************************************************/
 
 more(where)
 int	where;
@@ -145,7 +145,7 @@ int	where;
 /	number.
 /	If no valid number is found, return 0.0.
 /
-/************************************************************************/
+*************************************************************************/
 
 double
 infloat()
@@ -183,7 +183,7 @@ double	result;		/* return value */
 /	Refresh screen, and get a single character option from player.
 /	Return a random value if player's ring has gone bad.
 /
-/************************************************************************/
+*************************************************************************/
 
 inputoption()
 {
@@ -226,7 +226,7 @@ inputoption()
 /	If the player wants to quit while in battle, he/she automatically
 /	dies.
 /
-/************************************************************************/
+*************************************************************************/
 
 interrupt()
 {
@@ -316,7 +316,7 @@ unsigned	savealarm;	/* to save alarm value */
 /	list of choices.
 /	Give up after 3 tries.
 /
-/************************************************************************/
+*************************************************************************/
 
 getanswer(choices, def)
 char	*choices;
@@ -427,7 +427,7 @@ YELL:		mvprintw(oldy + 1, 0, "Please choose one of : [%s]\n", choices);
 /	Come here when the alarm expires while waiting for input.
 /	Simply longjmp() into getanswer().
 /
-/************************************************************************/
+*************************************************************************/
 
 void
 catchalarm()
diff --git a/games/phantasia/main.c b/games/phantasia/main.c
index 89d56e8..84e6ce1 100644
--- a/games/phantasia/main.c
+++ b/games/phantasia/main.c
@@ -91,7 +91,7 @@
 /	Process arguments, initialize program, and loop forever processing
 /	player input.
 /
-/***************************************************************************/
+****************************************************************************/
 
 main(argc, argv)
 int	argc;
@@ -332,7 +332,7 @@ double	dtemp;			/* for temporary calculations */
 / DESCRIPTION:
 /	Set global flags, and open files which remain open.
 /
-/************************************************************************/
+*************************************************************************/
 
 initialstate()
 {
@@ -393,7 +393,7 @@ initialstate()
 / DESCRIPTION:
 /	Prompt player, and roll up new character.
 /
-/************************************************************************/
+*************************************************************************/
 
 long
 rollnewplayer()
@@ -512,7 +512,7 @@ int	ch;		/* input */
 / DESCRIPTION:
 /	Process main menu options.
 /
-/************************************************************************/
+*************************************************************************/
 
 procmain()
 {
@@ -745,7 +745,7 @@ bool	hasmoved = FALSE;	/* set if player has moved */
 / DESCRIPTION:
 /	Print important information about game, players, etc.
 /
-/************************************************************************/
+*************************************************************************/
 
 titlelist()
 {
@@ -878,7 +878,7 @@ char	hiname[21], nxtname[21];/* used for finding the two highest players */
 / DESCRIPTION:
 /	Search for a character of a certain name, and check password.
 /
-/************************************************************************/
+*************************************************************************/
 
 long
 recallplayer()
@@ -964,7 +964,7 @@ int	ch;			/* input */
 / DESCRIPTION:
 /	Handle gurus, medics, etc.
 /
-/************************************************************************/
+*************************************************************************/
 
 neatstuff()
 {
@@ -1098,7 +1098,7 @@ int	ch;	/* input */
 / DESCRIPTION:
 /	Use the lookup table for rolling stats.
 /
-/************************************************************************/
+*************************************************************************/
 
 genchar(type)
 int	type;
@@ -1158,7 +1158,7 @@ register struct charstats	*statptr;/* for pointing into Stattable */
 / DESCRIPTION:
 /	Catch a bunch of signals, and turn on curses stuff.
 /
-/************************************************************************/
+*************************************************************************/
 
 playinit()
 {
@@ -1264,7 +1264,7 @@ playinit()
 /	Close all open files.  If we are "in curses" terminate curses.
 /	If 'doexit' is set, exit, otherwise return.
 /
-/************************************************************************/
+*************************************************************************/
 
 cleanup(doexit)
 bool	doexit;
diff --git a/games/phantasia/misc.c b/games/phantasia/misc.c
index 42c039d..48b518e 100644
--- a/games/phantasia/misc.c
+++ b/games/phantasia/misc.c
@@ -30,7 +30,7 @@
 /	level.
 /	Check for council of wise, and being too big to be king.
 /
-/************************************************************************/
+*************************************************************************/
 
 movelevel()
 {
@@ -110,7 +110,7 @@ double	inc;			/* increment between new and old levels */
 /	Look at coordinates and return an appropriately formatted
 /	string.
 /
-/************************************************************************/
+*************************************************************************/
 
 char	*
 descrlocation(playerp, shortflag)
@@ -211,7 +211,7 @@ static char	*nametable[4][4] =   /* names of places */
 /	a few books.  Higher level players shouldn't even bother to pick
 /	up gold, except maybe to buy mana once in a while.
 /
-/************************************************************************/
+*************************************************************************/
 
 tradingpost()
 {
@@ -499,7 +499,7 @@ bool	dishonest = FALSE;/* set when merchant is dishonest */
 / DESCRIPTION:
 /	Important player statistics are printed on the screen.
 /
-/************************************************************************/
+*************************************************************************/
 
 displaystats()
 {
@@ -533,7 +533,7 @@ displaystats()
 / DESCRIPTION:
 /	Print out some player statistics of lesser importance.
 /
-/************************************************************************/
+*************************************************************************/
 
 allstatslist()
 {
@@ -592,7 +592,7 @@ static	char	*flags[] =	/* to print value of some bools */
 /	has a crown.
 /	If 'shortflag' is TRUE, return a 3 character string.
 /
-/************************************************************************/
+*************************************************************************/
 
 char	*
 descrtype(playerp, shortflag)
@@ -685,7 +685,7 @@ static char	*results[] =	/* description table */
 /	Search the player file for the player of the given name.
 /	If player is found, fill structure with player data.
 /
-/************************************************************************/
+*************************************************************************/
 
 long
 findname(name, playerp)
@@ -731,7 +731,7 @@ long	loc = 0;			/* location in the file */
 /	Search the player file for an unused entry.  If none are found,
 /	make one at the end of the file.
 /
-/************************************************************************/
+*************************************************************************/
 
 long
 allocrecord()
@@ -779,7 +779,7 @@ long	loc = 0L;		/* location in file */
 / DESCRIPTION:
 /	Mark structure as not used, and update player file.
 /
-/************************************************************************/
+*************************************************************************/
 
 freerecord(playerp, loc)
 struct player	*playerp;
@@ -812,7 +812,7 @@ long	loc;
 /	Mark player as inactive, and cleanup.
 /	Do not save players below level 1.
 /
-/************************************************************************/
+*************************************************************************/
 
 leavegame()
 {
@@ -859,7 +859,7 @@ leavegame()
 /	Update scoreboard, lastdead, and let other players know about
 /	the demise of their comrade.
 /
-/************************************************************************/
+*************************************************************************/
 
 death(how)
 char	*how;
@@ -989,7 +989,7 @@ static	char	*deathmesg[] =
 / DESCRIPTION:
 /	Update location in player file with given structure.
 /
-/************************************************************************/
+*************************************************************************/
 
 writerecord(playerp, place)
 register struct player	*playerp;
@@ -1023,7 +1023,7 @@ long	place;
 /	Experience level is a geometric progression.  This has been finely
 /	tuned over the years, and probably should not be changed.
 /
-/************************************************************************/
+*************************************************************************/
 
 double
 explevel(experience)
@@ -1057,7 +1057,7 @@ double	experience;
 / DESCRIPTION: 
 /	Put nul characters in place of spaces at the end of the string.
 /
-/************************************************************************/
+*************************************************************************/
 
 truncstring(string)
 register char	*string;
@@ -1094,7 +1094,7 @@ register int	length;		/* length of string */
 /	If the player is beyond the point of no return, he/she is forced
 /	to stay there.
 /
-/************************************************************************/
+*************************************************************************/
 
 altercoordinates(xnew, ynew, operation)
 double	xnew;
@@ -1170,7 +1170,7 @@ int	operation;
 / DESCRIPTION:
 /	Read structure information from player file.
 /
-/************************************************************************/
+*************************************************************************/
 
 readrecord(playerp, loc)
 register struct player	*playerp;
@@ -1201,7 +1201,7 @@ long	loc;
 / DESCRIPTION:
 /	Handle adjustment and maximums on various player characteristics.
 /
-/************************************************************************/
+*************************************************************************/
 
 adjuststats()
 {
@@ -1319,7 +1319,7 @@ double	dtemp;				/* for temporary calculations */
 / DESCRIPTION:
 /	Put a bunch of default values in the given structure.
 /
-/************************************************************************/
+*************************************************************************/
 
 initplayer(playerp)
 register struct  player   *playerp;
@@ -1401,7 +1401,7 @@ register struct  player   *playerp;
 / DESCRIPTION:
 /	If there is a message from other players, print it.
 /
-/************************************************************************/
+*************************************************************************/
 
 readmessage()
 {
@@ -1434,7 +1434,7 @@ readmessage()
 / DESCRIPTION:
 /	Print message about offending file, and exit.
 /
-/************************************************************************/
+*************************************************************************/
 
 error(whichfile)
 	char	*whichfile;
@@ -1479,7 +1479,7 @@ error(whichfile)
 /	This function is provided because someone's hypot() library function
 /	fails if x1 == x2 && y1 == y2.
 /
-/************************************************************************/
+*************************************************************************/
 
 double
 distance(x1, x2, y1, y2)
@@ -1515,7 +1515,7 @@ double	deltax, deltay;
 / DESCRIPTION:
 /	When an illegal signal is caught, print a message, and cleanup.
 /
-/************************************************************************/
+*************************************************************************/
 
 ill_sig(whichsig)
 int whichsig;
@@ -1550,7 +1550,7 @@ int whichsig;
 /	Return verbal description of player status.
 /	If player status is S_PLAYING, check for low energy and blindness.
 /
-/************************************************************************/
+*************************************************************************/
 
 char	*
 descrstatus(playerp)
@@ -1613,7 +1613,7 @@ register struct player	*playerp;
 /	We mask large integers with 32767 to handle sites that return
 /	31 bit random integers.
 /
-/************************************************************************/
+*************************************************************************/
 
 double
 drandom()
@@ -1651,7 +1651,7 @@ drandom()
 /	Add taxes to tax data base; add remaining gold and gems to
 /	player's cache.
 /
-/************************************************************************/
+*************************************************************************/
 
 collecttaxes(gold, gems)
 double	gold;
diff --git a/games/phantasia/setup.c b/games/phantasia/setup.c
index 0306678..1d6587b 100644
--- a/games/phantasia/setup.c
+++ b/games/phantasia/setup.c
@@ -35,7 +35,7 @@
 /	put in these files.
 /	Also, the monster binary data base is created here.
 /
-/************************************************************************/
+*************************************************************************/
 
 static char *files[] = {		/* all files to create */
 	_SPATH_MONST,
@@ -217,7 +217,7 @@ main(argc, argv)
 / DESCRIPTION:
 /	Print an error message, then exit.
 /
-/************************************************************************/
+*************************************************************************/
 
 Error(str, file)
 char	*str, *file;
@@ -249,7 +249,7 @@ char	*str, *file;
 /
 / DESCRIPTION: 
 /
-/************************************************************************/
+*************************************************************************/
 
 double
 drandom()