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

Merge branch 'AlexK-misc'

Browse Source
This commit is contained in:
nhmall
2015-05-01 18:24:59 -04:00
parent 8f639796d5 664b4eb643
commit 573c9dc98f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/lev.h
View File

@@ -13,6 +13,8 @@
#define WRITE_SAVE 0x2
#define FREE_SAVE 0x4
#define MAX_BMASK 4
/* operations of the various saveXXXchn & co. routines */
#define perform_bwrite(mode) ((mode) & (COUNT_SAVE|WRITE_SAVE))
#define release_data(mode) ((mode) & FREE_SAVE)
@@ -33,7 +35,7 @@ struct container {
struct bubble {
xchar x, y; /* coordinates of the upper left corner */
schar dx, dy; /* the general direction of the bubble's movement */
uchar *bm; /* pointer to the bubble bit mask */
uchar bm[MAX_BMASK+2]; /* bubble bit mask */
struct bubble *prev, *next; /* need to traverse the list up and down */
struct container *cons;
};

7
src/mkmaze.c
View File

@@ -1262,6 +1262,9 @@ register int x, y, n;
impossible("n too large (mk_bubble)");
n = SIZE(bmask) - 1;
}
if (bmask[n][1] > MAX_BMASK) {
panic("bmask size is larger than MAX_BMASK");
}
b = (struct bubble *)alloc(sizeof(struct bubble));
if ((x + (int) bmask[n][0] - 1) > bxmax) x = bxmax - bmask[n][0] + 1;
if ((y + (int) bmask[n][1] - 1) > bymax) y = bymax - bmask[n][1] + 1;
@@ -1269,7 +1272,9 @@ register int x, y, n;
b->y = y;
b->dx = 1 - rn2(3);
b->dy = 1 - rn2(3);
b->bm = bmask[n];
/* y dimension is the length of bitmap data - see bmask above */
(void)memcpy((genericptr_t)b->bm, (genericptr_t)bmask[n],
(bmask[n][1]+2)*sizeof(b->bm[0]));
b->cons = 0;
if (!bbubbles) bbubbles = b;
if (ebubbles) {