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

Merge remote-tracking branch 'origin/NetHack-3.6.0'

Browse Source
This commit is contained in:
keni
2016-12-31 19:21:15 -05:00
parent ea8d4ae301 79870d33be
commit 4c6e0f03a5
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/end.c
View File

@@ -1824,6 +1824,7 @@ const char *killername;
if (k == (struct kinfo *) 0) {
/* no match, add a new delayed killer to the list */
k = (struct kinfo *) alloc(sizeof(struct kinfo));
(void) memset((genericptr_t)k, 0, sizeof(struct kinfo));
k->id = id;
k->next = killer.next;
killer.next = k;

7
src/engrave.c
View File

@@ -385,11 +385,12 @@ long e_time;
xchar e_type;
{
struct engr *ep;
unsigned smem = strlen(s) + 1;
if ((ep = engr_at(x, y)) != 0)
del_engr(ep);
ep = newengr(strlen(s) + 1);
(void) memset((genericptr_t)ep, 0, sizeof(struct engr));
ep = newengr(smem);
(void) memset((genericptr_t)ep, 0, smem + sizeof(struct engr));
ep->nxt_engr = head_engr;
head_engr = ep;
ep->engr_x = x;
@@ -401,7 +402,7 @@ xchar e_type;
exercise(A_WIS, TRUE);
ep->engr_time = e_time;
ep->engr_type = e_type > 0 ? e_type : rnd(N_ENGRAVE - 1);
ep->engr_lth = strlen(s) + 1;
ep->engr_lth = smem;
}
/* delete any engraving at location <x,y> */

7
src/mplayer.c
View File

@@ -16,9 +16,10 @@ STATIC_DCL void FDECL(mk_mplayer_armor, (struct monst *, SHORT_P));
*/
static const char *developers[] = {
/* devteam */
"Dave", "Dean", "Eric", "Izchak", "Janet", "Jessie",
"Ken", "Kevin", "Michael", "Mike", "Pat", "Paul",
"Steve", "Timo", "Warwick",
"Alex", "Dave", "Dean", "Derek", "Eric", "Izchak",
"Janet", "Jessie", "Ken", "Kevin", "Michael", "Mike",
"Pasi", "Pat", "Patric", "Paul", "Sean", "Steve",
"Timo", "Warwick",
/* PC team */
"Bill", "Eric", "Keizo", "Ken", "Kevin", "Michael",
"Mike", "Paul", "Stephen", "Steve", "Timo", "Yitzhak",

1
src/region.c
View File

@@ -91,6 +91,7 @@ int nrect;
NhRegion *reg;
reg = (NhRegion *) alloc(sizeof(NhRegion));
(void) memset((genericptr_t)reg, 0, sizeof(NhRegion));
/* Determines bounding box */
if (nrect > 0) {
reg->bounding_box = rects[0];

1
src/shk.c
View File

@@ -3307,6 +3307,7 @@ long cost;
return;
}
tmp_dam = (struct damage *) alloc((unsigned) sizeof(struct damage));
(void) memset((genericptr_t)tmp_dam, 0, sizeof(struct damage));
tmp_dam->when = monstermoves;
tmp_dam->place.x = x;
tmp_dam->place.y = y;