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

more recovered bits

Browse Source 
Some worthwhile stuff from abandoned 'git stash':
 is_plural() macro wasn't comprehensive;
 a couple of return values where writing with a magic marker was
   causing time to elapse even though nothing happened;
 comment formatting for saddle being left in shop by dying steed.
This commit is contained in:
PatR
2016-03-25 17:26:37 -07:00
parent 41b8f38272
commit 862d37c77a
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/obj.h
+1 -1
View File
@@ -337,7 +337,7 @@ struct obj {
/* helpers, simple enough to be macros */ /* helpers, simple enough to be macros */
#define is_plural(o) \ #define is_plural(o) \
((o)->quan > 1 || (o)->oartifact == ART_EYES_OF_THE_OVERWORLD) ((o)->quan != 1L || (o)->otyp == LENSES || is_gloves(o) || is_boots(o))
/* Flags for get_obj_location(). */ /* Flags for get_obj_location(). */
#define CONTAINED_TOO 0x1 #define CONTAINED_TOO 0x1
src/steal.c
+5 -4
View File
@@ -646,10 +646,11 @@ boolean verbosely;
if (mon->mhp > 0) { if (mon->mhp > 0) {
mon->misc_worn_check &= ~obj->owornmask; mon->misc_worn_check &= ~obj->owornmask;
update_mon = TRUE; update_mon = TRUE;
/* don't charge for an owned saddle on dead steed (provided
that the hero is within the same shop at the time) */ /* don't charge for an owned saddle on dead steed (provided
} else if (mon->mtame && (obj->owornmask & W_SADDLE) && !obj->unpaid that the hero is within the same shop at the time) */
&& costly_spot(omx, omy) } else if (mon->mtame && (obj->owornmask & W_SADDLE) != 0L
&& !obj->unpaid && costly_spot(omx, omy)
/* being at costly_spot guarantees lev->roomno is not 0 */ /* being at costly_spot guarantees lev->roomno is not 0 */
&& index(in_rooms(u.ux, u.uy, SHOPBASE), && index(in_rooms(u.ux, u.uy, SHOPBASE),
levl[omx][omy].roomno)) { levl[omx][omy].roomno)) {
src/write.c
+2 -2
View File
@@ -128,12 +128,12 @@ register struct obj *pen;
if (Blind) { if (Blind) {
if (!paper->dknown) { if (!paper->dknown) {
You("don't know if that %s is blank or not.", typeword); You("don't know if that %s is blank or not.", typeword);
return 1; return 0;
} else if (paper->oclass == SPBOOK_CLASS) { } else if (paper->oclass == SPBOOK_CLASS) {
/* can't write a magic book while blind */ /* can't write a magic book while blind */
pline("%s can't create braille text.", pline("%s can't create braille text.",
upstart(ysimple_name(pen))); upstart(ysimple_name(pen)));
return 1; return 0;
} }
} }
paper->dknown = 1; paper->dknown = 1;