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

Separate permonst valid location humidity function

Browse Source
This commit is contained in:
Pasi Kallinen
2016-05-23 22:19:43 +03:00
parent fdc1889d0d
commit caafec1bc7
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/sp_lev.h
View File

@@ -218,12 +218,13 @@ enum opcode_defs {
#define SP_COORD_IS_RANDOM 0x01000000 #define SP_COORD_IS_RANDOM 0x01000000
/* Humidity flags for get_location() and friends, used with /* Humidity flags for get_location() and friends, used with
* SP_COORD_PACK_RANDOM() */ * SP_COORD_PACK_RANDOM() */
#define DRY 0x1 #define DRY 0x01
#define WET 0x2 #define WET 0x02
#define HOT 0x4 #define HOT 0x04
#define SOLID 0x8 #define SOLID 0x08
#define ANY_LOC 0x10 /* even outside the level */ #define ANY_LOC 0x10 /* even outside the level */
#define NO_LOC_WARN 0x20 /* no complaints and set x & y to -1, if no loc */ #define NO_LOC_WARN 0x20 /* no complaints and set x & y to -1, if no loc */
#define SPACELOC 0x40 /* like DRY, but accepts furniture too */
#define SP_COORD_X(l) (l & 0xff) #define SP_COORD_X(l) (l & 0xff)
#define SP_COORD_Y(l) ((l >> 16) & 0xff) #define SP_COORD_Y(l) ((l >> 16) & 0xff)

31
src/sp_lev.c
View File

@@ -72,6 +72,7 @@ STATIC_DCL void FDECL(create_door, (room_door *, struct mkroom *));
STATIC_DCL void FDECL(create_trap, (trap *, struct mkroom *)); STATIC_DCL void FDECL(create_trap, (trap *, struct mkroom *));
STATIC_DCL int FDECL(noncoalignment, (ALIGNTYP_P)); STATIC_DCL int FDECL(noncoalignment, (ALIGNTYP_P));
STATIC_DCL boolean FDECL(m_bad_boulder_spot, (int, int)); STATIC_DCL boolean FDECL(m_bad_boulder_spot, (int, int));
STATIC_DCL int FDECL(pm_to_humidity, (struct permonst *));
STATIC_DCL void FDECL(create_monster, (monster *, struct mkroom *)); STATIC_DCL void FDECL(create_monster, (monster *, struct mkroom *));
STATIC_DCL void FDECL(create_object, (object *, struct mkroom *)); STATIC_DCL void FDECL(create_object, (object *, struct mkroom *));
STATIC_DCL void FDECL(create_altar, (altar *, struct mkroom *)); STATIC_DCL void FDECL(create_altar, (altar *, struct mkroom *));
@@ -895,6 +896,8 @@ register int humidity;
|| typ == CORR) || typ == CORR)
return TRUE; return TRUE;
} }
if ((humidity & SPACELOC) && SPACE_POS(levl[x][y].typ))
return TRUE;
if ((humidity & WET) && is_pool(x, y)) if ((humidity & WET) && is_pool(x, y))
return TRUE; return TRUE;
if ((humidity & HOT) && is_lava(x, y)) if ((humidity & HOT) && is_lava(x, y))
@@ -1495,6 +1498,24 @@ int x, y;
return FALSE; return FALSE;
} }
STATIC_OVL int
pm_to_humidity(pm)
struct permonst *pm;
{
int loc = DRY;
if (!pm)
return loc;
if (pm->mlet == S_EEL || amphibious(pm) || is_swimmer(pm))
loc = WET;
if (is_flyer(pm) || is_floater(pm))
loc |= (HOT | WET);
if (passes_walls(pm) || noncorporeal(pm))
loc |= SOLID;
if (flaming(pm))
loc |= HOT;
return loc;
}
STATIC_OVL void STATIC_OVL void
create_monster(m, croom) create_monster(m, croom)
monster *m; monster *m;
@@ -1543,15 +1564,7 @@ struct mkroom *croom;
pm = (struct permonst *) 0; pm = (struct permonst *) 0;
if (pm) { if (pm) {
int loc = DRY; int loc = pm_to_humidity(pm);
if (pm->mlet == S_EEL || amphibious(pm) || is_swimmer(pm))
loc = WET;
if (is_flyer(pm) || is_floater(pm))
loc |= (HOT | WET);
if (passes_walls(pm) || noncorporeal(pm))
loc |= SOLID;
if (flaming(pm))
loc |= HOT;
/* If water-liking monster, first try is without DRY */ /* If water-liking monster, first try is without DRY */
get_location_coord(&x, &y, loc | NO_LOC_WARN, croom, m->coord); get_location_coord(&x, &y, loc | NO_LOC_WARN, croom, m->coord);
if (x == -1 && y == -1) { if (x == -1 && y == -1) {