apply Janet's lint catches to trunk
This commit is contained in:
@@ -1543,7 +1543,9 @@ E int FDECL(loot_mon, (struct monst *,int *,boolean *));
|
|||||||
E int NDECL(dotip);
|
E int NDECL(dotip);
|
||||||
E const char *FDECL(safe_qbuf, (const char *,unsigned,
|
E const char *FDECL(safe_qbuf, (const char *,unsigned,
|
||||||
const char *,const char *,const char *));
|
const char *,const char *,const char *));
|
||||||
|
#ifdef AUTOPICKUP_EXCEPTIONS
|
||||||
E boolean FDECL(is_autopickup_exception, (struct obj *, BOOLEAN_P));
|
E boolean FDECL(is_autopickup_exception, (struct obj *, BOOLEAN_P));
|
||||||
|
#endif /* AUTOPICKUP_EXCEPTIONS */
|
||||||
|
|
||||||
/* ### pline.c ### */
|
/* ### pline.c ### */
|
||||||
|
|
||||||
|
|||||||
@@ -374,7 +374,8 @@ boolean with_you;
|
|||||||
if (xlocale && ylocale)
|
if (xlocale && ylocale)
|
||||||
place_object(obj, xlocale, ylocale);
|
place_object(obj, xlocale, ylocale);
|
||||||
else if (rloco(obj)) {
|
else if (rloco(obj)) {
|
||||||
get_obj_location(obj, &xlocale, &ylocale, 0);
|
if (!get_obj_location(obj, &xlocale, &ylocale, 0))
|
||||||
|
impossible("Can't find relocated object.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
corpse = mkcorpstat(CORPSE, (struct monst *)0, mtmp->data,
|
corpse = mkcorpstat(CORPSE, (struct monst *)0, mtmp->data,
|
||||||
|
|||||||
@@ -894,7 +894,7 @@ register int pm;
|
|||||||
if (dmgtype(ptr, AD_STUN) || dmgtype(ptr, AD_HALU) ||
|
if (dmgtype(ptr, AD_STUN) || dmgtype(ptr, AD_HALU) ||
|
||||||
pm == PM_VIOLET_FUNGUS) {
|
pm == PM_VIOLET_FUNGUS) {
|
||||||
pline ("Oh wow! Great stuff!");
|
pline ("Oh wow! Great stuff!");
|
||||||
make_hallucinated(HHallucination + 200,FALSE,0L);
|
(void) make_hallucinated(HHallucination + 200,FALSE,0L);
|
||||||
}
|
}
|
||||||
if(is_giant(ptr)) gainstr((struct obj *)0, 0);
|
if(is_giant(ptr)) gainstr((struct obj *)0, 0);
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -329,7 +329,8 @@ boolean forcecontrol;
|
|||||||
}
|
}
|
||||||
if (is_pool(u.ux,u.uy) && was_floating && !(Levitation || Flying) &&
|
if (is_pool(u.ux,u.uy) && was_floating && !(Levitation || Flying) &&
|
||||||
!breathless(youmonst.data) && !amphibious(youmonst.data) &&
|
!breathless(youmonst.data) && !amphibious(youmonst.data) &&
|
||||||
!Swimming) drown();
|
!Swimming)
|
||||||
|
(void) drown();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (try to) make a mntmp monster out of the player */
|
/* (try to) make a mntmp monster out of the player */
|
||||||
|
|||||||
Reference in New Issue
Block a user