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/write.c
View File

@@ -18,7 +18,7 @@ register struct obj *otmp;
return (10 * objects[otmp->otyp].oc_level);
switch (otmp->otyp) {
#ifdef MAIL
#ifdef MAIL_STRUCTURES
case SCR_MAIL:
return 2;
#endif
@@ -333,7 +333,7 @@ found:
}
new_obj->blessed = (curseval > 0);
new_obj->cursed = (curseval < 0);
#ifdef MAIL
#ifdef MAIL_STRUCTURES
if (new_obj->otyp == SCR_MAIL)
/* 0: delivered in-game via external event (or randomly for fake mail);
1: from bones or wishing; 2: written with marker */