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

broken wand of striking vs door (trunk only)

Browse Source 
<email deleted> wrote:
> * Doors absorb the blast of a broken wand of striking. What's more, the message
> reads "The door absorbs your bolt!" rather than "blast".

passes wand type to explode() as a negative value for the case
where the wand type isn't mapped to an AD_* explosion type.

Then explode() converts it to a positive and passes it to zap_over_floor().
This commit is contained in:
nethack.allison
2006-03-07 03:10:58 +00:00
parent 3e8725ed95
commit 71ed473cf6
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/explode.c
View File

@@ -29,7 +29,7 @@ static int explosion[3][3] = {
void
explode(x, y, type, dam, olet, expltype)
int x, y;
int type; /* the same as in zap.c */
int type; /* the same as in zap.c; passes -(wand typ) for some WAND_CLASS */
int dam;
char olet;
int expltype;
@@ -47,8 +47,14 @@ int expltype;
boolean shopdamage = FALSE, generic = FALSE, physical_dmg = FALSE,
do_hallu = FALSE;
char hallu_buf[BUFSZ];
short exploding_wand_typ = 0;
if (olet == WAND_CLASS) /* retributive strike */
if (olet == WAND_CLASS) { /* retributive strike */
/* If 'type' < 0 it indicates (wand type * -1) */
if (type < 0) {
exploding_wand_typ = (short)(type * -1);
type = 0;
}
switch (Role_switch) {
case PM_PRIEST:
case PM_MONK:
@@ -59,6 +65,7 @@ int expltype;
break;
default: break;
}
}
if (olet == MON_EXPLODE) {
str = killer.name;
@@ -241,7 +248,7 @@ int expltype;
idamres = idamnonres = 0;
if (type >= 0)
(void)zap_over_floor((xchar)(i+x-1), (xchar)(j+y-1),
type, &shopdamage);
type, &shopdamage, exploding_wand_typ);
mtmp = m_at(i+x-1, j+y-1);
#ifdef STEED