separate MAIL functionality from MAIL-related structure inclusion

With 3.7+ aspirations of improving savefile interoperability between 32-bit
and 64-bit builds, as well as between platforms, it is better to not have
the underlying struct/array content be conditional.

This splits off some of the MAIL code into MAIL_STRUCTURES code. In theory,
since MAIL_STRUCTURES is unconditionally included, the macro could
just go away and leave that code unconditional, but this commit doesn't
go that far.
This commit is contained in:
nhmall
2019-11-09 16:19:05 -05:00
parent e6bafb3f90
commit 75d22a2dbf
20 changed files with 41 additions and 29 deletions

View File

@@ -2104,7 +2104,7 @@ eatspecial()
return;
}
if (objects[otmp->otyp].oc_material == PAPER) {
#ifdef MAIL
#ifdef MAIL_STRUCTURES
if (otmp->otyp == SCR_MAIL)
/* no nutrition */
pline("This junk mail is less than satisfying.");
@@ -2550,7 +2550,7 @@ doeat()
/* oc_nutrition is usually weight anyway */
else
basenutrit = objects[otmp->otyp].oc_nutrition;
#ifdef MAIL
#ifdef MAIL_STRUCTURES
if (otmp->otyp == SCR_MAIL) {
basenutrit = 0;
nodelicious = TRUE;