nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

The word "zorkmid" was hard-coded in format strings all

Browse Source 
over the place.

Often they would use
	"%ld zorkmid%s", amt, plur(amt)
but not consistently, so some of the hard-coded usage
could result in "1 zorkmids"

This adds the function
	currency(long)
to return the name of the currency, either plural
or singular depending on the argument passed to it.
That eliminates the need for the extra %s in the
format string and the use of the plur() macro.
This commit is contained in:
nethack.allison
2002-01-21 03:35:04 +00:00
parent 4f10682592
commit f2fe0a3d5c
12 changed files with 100 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/minion.c
View File

@@ -140,8 +140,8 @@ register struct monst *mtmp;
if (!demand) /* you have no gold */
return mtmp->mpeaceful = 0;
else {
pline("%s demands %ld zorkmid%s for safe passage.",
Amonnam(mtmp), demand, plur(demand));
pline("%s demands %ld %s for safe passage.",
Amonnam(mtmp), demand, currency(demand));
if ((offer = bribe(mtmp)) >= demand) {
pline("%s vanishes, laughing about cowardly mortals.",
@@ -185,8 +185,8 @@ struct monst *mtmp;
} else if (offer >= u.ugold) {
You("give %s all your gold.", mon_nam(mtmp));
offer = u.ugold;
} else You("give %s %ld zorkmid%s.", mon_nam(mtmp), offer,
plur(offer));
} else You("give %s %ld %s.", mon_nam(mtmp), offer,
currency(offer));
u.ugold -= offer;
mtmp->mgold += offer;
@@ -194,8 +194,8 @@ struct monst *mtmp;
} else if (offer >= umoney) {
You("give %s all your gold.", mon_nam(mtmp));
offer = umoney;
} else You("give %s %ld zorkmid%s.", mon_nam(mtmp), offer,
plur(offer));
} else You("give %s %ld %s.", mon_nam(mtmp), offer,
currency(offer));
money2mon(mtmp, offer);
#endif