From ce0665cd159953d873a064a047cf77b0564618b8 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 20 Feb 2015 20:26:46 +0200 Subject: [PATCH] Add a missing break Stepping on a magic trap while riding could delete the trap and make the deleted trap hit the steed. --- doc/fixes35.0 | 1 + src/trap.c | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/fixes35.0 b/doc/fixes35.0 index 5c98db414..5aaa60013 100644 --- a/doc/fixes35.0 +++ b/doc/fixes35.0 @@ -856,6 +856,7 @@ fix "object_is_local" panic when saving bones after hero is killed by explosion produced by dropped or thrown lit potion of oil if lava burns up the player's water walking boots, the player falls in the messages for lava burning items up are always printed +fix used-up magic trap trying to hit steed. Platform- and/or Interface-Specific Fixes diff --git a/src/trap.c b/src/trap.c index e33b57730..232e4832e 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1213,6 +1213,7 @@ glovecheck: (void) rust_dmg(uarmg, "gauntlets", 1, TRUE, &youmonst); losehp(rnd(10), "magical explosion", KILLED_BY_AN); Your("body absorbs some of the magical energy!"); u.uen = (u.uenmax += 2); + break; } else domagictrap(); #ifdef STEED (void) steedintrap(trap, (struct obj *)0);