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

mextra follow up bit 2

Browse Source 
<Someone> noticed the leftover zeromextra, this removes it.

Using memset() on a possibly failed mextra allocation was inapprorpriate,
so replace the newmextra() macro with a function.

Prevent a crash in christen_monst() if mextra was not initialized.
This commit is contained in:
nethack.allison
2006-01-06 22:16:46 +00:00
parent 30c508a664
commit aea3c50163
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/extern.h
View File

@@ -969,6 +969,7 @@ E boolean FDECL(is_home_elemental, (struct permonst *));
E struct monst *FDECL(clone_mon, (struct monst *,XCHAR_P,XCHAR_P));
E int FDECL(monhp_per_lvl, (struct monst *));
E void FDECL(newmonhp, (struct monst *,int));
E struct mextra *NDECL(newmextra);
E struct monst *FDECL(makemon, (struct permonst *,int,int,int));
E boolean FDECL(create_critters, (int,struct permonst *));
E struct permonst *NDECL(rndmonst);

4
include/mextra.h
View File

@@ -110,10 +110,6 @@ struct mextra {
struct edog *edog;
};
#define newmextra() \
(struct mextra *) memset((genericptr_t)alloc(sizeof(struct mextra)), \
0, sizeof(struct mextra))
#define MNAME(mon) ((mon)->mextra->mname)
#define EGD(mon) ((mon)->mextra->egd)
#define EPRI(mon) ((mon)->mextra->epri)