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

fix B04004 "lead steed" into pit after landmine

Browse Source 
<Someone> wrote:
	KAABLAMM!!!  You triggered [your|a] land mine!
	You lead the poor warhorse into a pit!
	Is "lead" really the right word here?
This commit is contained in:
nethack.allison
2003-07-12 16:59:32 +00:00
parent b88e0a13ab
commit 8eb6614a56
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/hack.h
+1
View File
@@ -180,6 +180,7 @@ NEARDATA extern coord bhitpos; /* place where throw or zap hits or stops */
/* Flags to control dotrap() in trap.c */ /* Flags to control dotrap() in trap.c */
#define NOWEBMSG 0x01 /* suppress stumble into web message */ #define NOWEBMSG 0x01 /* suppress stumble into web message */
#define FORCEBUNGLE 0x02 /* adjustments appropriate for bungling */ #define FORCEBUNGLE 0x02 /* adjustments appropriate for bungling */
#define RECURSIVETRAP 0x04 /* trap changed into another type this same turn */
/* Flags to control test_move in hack.c */ /* Flags to control test_move in hack.c */
#define DO_MOVE 0 /* really doing the move */ #define DO_MOVE 0 /* really doing the move */
src/trap.c
+10 -4
View File
@@ -812,12 +812,18 @@ glovecheck: (void) rust_dmg(uarmg, "gauntlets", 1, TRUE, &youmonst);
if (!In_sokoban(&u.uz)) { if (!In_sokoban(&u.uz)) {
char verbbuf[BUFSZ]; char verbbuf[BUFSZ];
#ifdef STEED #ifdef STEED
if (u.usteed) if (u.usteed) {
Sprintf(verbbuf,"lead %s", if ((trflags & RECURSIVETRAP) != 0)
Sprintf(verbbuf, "and %s fall",
x_monnam(u.usteed,
u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE,
(char *)0, SUPPRESS_SADDLE, FALSE));
else
Sprintf(verbbuf,"lead %s",
x_monnam(u.usteed, x_monnam(u.usteed,
u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE, u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE,
"poor", SUPPRESS_SADDLE, FALSE)); "poor", SUPPRESS_SADDLE, FALSE));
else } else
#endif #endif
Strcpy(verbbuf,"fall"); Strcpy(verbbuf,"fall");
You("%s into %s pit!", verbbuf, a_your[trap->madeby_u]); You("%s into %s pit!", verbbuf, a_your[trap->madeby_u]);
@@ -1076,7 +1082,7 @@ glovecheck: (void) rust_dmg(uarmg, "gauntlets", 1, TRUE, &youmonst);
newsym(u.ux,u.uy); /* update trap symbol */ newsym(u.ux,u.uy); /* update trap symbol */
losehp(rnd(16), "land mine", KILLED_BY_AN); losehp(rnd(16), "land mine", KILLED_BY_AN);
/* fall recursively into the pit... */ /* fall recursively into the pit... */
if ((trap = t_at(u.ux, u.uy)) != 0) dotrap(trap, 0); if ((trap = t_at(u.ux, u.uy)) != 0) dotrap(trap, RECURSIVETRAP);
fill_pit(u.ux, u.uy); fill_pit(u.ux, u.uy);
break; break;