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

Lua: Allow matching any wall

Browse Source 
A 'w' in a map fragment will match any wall (IS_WALL macro):

   des.replace_terrain({ mapfragment = "w", toterrain = "F" });
This commit is contained in:
Pasi Kallinen
2020-10-10 11:31:16 +03:00
parent c154dd2609
commit 3d6551a70e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sp_lev.c
+4 -1
View File
@@ -197,6 +197,9 @@ static struct monst *invent_carrying_monster = (struct monst *) 0;
* end of no 'g.' * end of no 'g.'
*/ */
#define TYP_CANNOT_MATCH(typ) \
((typ) == MAX_TYPE || (typ) == INVALID_TYPE)
/* Does typ match with levl[][].typ, considering special types /* Does typ match with levl[][].typ, considering special types
MATCH_WALL and MAX_TYPE (aka transparency)? */ MATCH_WALL and MAX_TYPE (aka transparency)? */
static boolean static boolean
@@ -277,7 +280,7 @@ struct mapfragment *mf;
else if (!mapfrag_canmatch(mf)) { else if (!mapfrag_canmatch(mf)) {
mapfrag_free(&mf); mapfrag_free(&mf);
return "mapfragment needs to have odd height and width"; return "mapfragment needs to have odd height and width";
} else if (mapfrag_get(mf, (mf->wid/2), (mf->hei/2)) >= MAX_TYPE) { } else if (TYP_CANNOT_MATCH(mapfrag_get(mf, (mf->wid/2), (mf->hei/2)))) {
mapfrag_free(&mf); mapfrag_free(&mf);
return "mapfragment center must be valid terrain"; return "mapfragment center must be valid terrain";
} }