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

obj_nexto_xy lint

Browse Source
This commit is contained in:
PatR
2015-04-10 18:31:11 -07:00
parent 5c919d6930
commit 91fc8dc69c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+2 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.5 extern.h $NHDT-Date: 1426966688 2015/03/21 19:38:08 $ $NHDT-Branch: master $:$NHDT-Revision: 1.411 $ */ /* NetHack 3.5 extern.h $NHDT-Date: 1428715841 2015/04/11 01:30:41 $ $NHDT-Branch: master $:$NHDT-Revision: 1.454 $ */
/* NetHack 3.5 extern.h $Date: 2013/11/05 00:57:53 $ $Revision: 1.380 $ */ /* NetHack 3.5 extern.h $Date: 2013/11/05 00:57:53 $ $Revision: 1.380 $ */
/* Copyright (c) Steve Creps, 1988. */ /* Copyright (c) Steve Creps, 1988. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1228,7 +1228,7 @@ E long FDECL(peek_at_iced_corpse_age, (struct obj *));
E int FDECL(hornoplenty, (struct obj *,BOOLEAN_P)); E int FDECL(hornoplenty, (struct obj *,BOOLEAN_P));
E void NDECL(obj_sanity_check); E void NDECL(obj_sanity_check);
E struct obj* FDECL(obj_nexto, (struct obj*)); E struct obj* FDECL(obj_nexto, (struct obj*));
E struct obj* FDECL(obj_nexto_xy, (int, int, int, int)); E struct obj* FDECL(obj_nexto_xy, (int, int, int, unsigned));
E struct obj* FDECL(obj_absorb, (struct obj**, struct obj**)); E struct obj* FDECL(obj_absorb, (struct obj**, struct obj**));
E struct obj* FDECL(obj_meld, (struct obj**, struct obj**)); E struct obj* FDECL(obj_meld, (struct obj**, struct obj**));
src/mkobj.c
+4 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.5 mkobj.c $NHDT-Date: 1426470337 2015/03/16 01:45:37 $ $NHDT-Branch: derek-farming $:$NHDT-Revision: 1.77 $ */ /* NetHack 3.5 mkobj.c $NHDT-Date: 1428715841 2015/04/11 01:30:41 $ $NHDT-Branch: master $:$NHDT-Revision: 1.91 $ */
/* NetHack 3.5 mkobj.c $Date: 2012/03/10 02:49:08 $ $Revision: 1.70 $ */ /* NetHack 3.5 mkobj.c $Date: 2012/03/10 02:49:08 $ $Revision: 1.70 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2163,7 +2163,8 @@ obj_nexto(otmp)
*/ */
struct obj* struct obj*
obj_nexto_xy(otyp, x, y, oid) obj_nexto_xy(otyp, x, y, oid)
int otyp, x, y, oid; int otyp, x, y;
unsigned oid;
{ {
struct obj* otmp; struct obj* otmp;
int fx, fy, ex, ey; int fx, fy, ex, ey;
@@ -2187,13 +2188,12 @@ obj_nexto_xy(otyp, x, y, oid)
for (fy = ey; abs(fy - ey) < 3; fy += dy) { for (fy = ey; abs(fy - ey) < 3; fy += dy) {
/* 0, 0 was checked above */ /* 0, 0 was checked above */
if (fx != x || fy != y) { if (fx != x || fy != y) {
if (otmp = sobj_at(otyp, fx, fy)) { if ((otmp = sobj_at(otyp, fx, fy)) != 0) {
return otmp; return otmp;
} }
} }
} }
} }
return NULL; return NULL;
} }