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

separate MAIL functionality from MAIL-related structure inclusion

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/trap.c
View File

@@ -3455,7 +3455,7 @@ struct obj *obj;
grease_protect(obj, (char *) 0, victim);
} else if (obj->oclass == SCROLL_CLASS && obj->otyp != SCR_BLANK_PAPER) {
if (obj->otyp != SCR_BLANK_PAPER
#ifdef MAIL
#ifdef MAIL_STRUCTURES
&& obj->otyp != SCR_MAIL
#endif
) {
@@ -3531,7 +3531,7 @@ boolean force;
return ER_NOTHING;
} else if (obj->oclass == SCROLL_CLASS) {
if (obj->otyp == SCR_BLANK_PAPER
#ifdef MAIL
#ifdef MAIL_STRUCTURES
|| obj->otyp == SCR_MAIL
#endif
) return 0;