From 27990c3bebef820d43463a1eb58359f6e98cfee3 Mon Sep 17 00:00:00 2001
From: Rob Pearce <rob@nethack.net>
Date: Fri, 31 Oct 2008 21:54:18 +0000
Subject: [PATCH] - Added missing level 40 - Gunner powerup now turns off
 netting & slamming when picked up - Helmet now causes puff of smoke above the
 player, not the powerup (in case   you pick it up with honey nets)

---
 data/world1/level40.dat | 40 ++++++++++++++++++++++++++++++++++++++++
 rc.c                    |  7 +++++--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 data/world1/level40.dat

diff --git a/data/world1/level40.dat b/data/world1/level40.dat
new file mode 100644
index 0000000..c637fd4
--- /dev/null
+++ b/data/world1/level40.dat
@@ -0,0 +1,40 @@
+bgfile fire1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 6 8
+endmonsters
+exitdir 1
+56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,
+56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,56,56,56,56,56,56,56,56,56,0,0,0,0,0,56,56,56,56,56,56,56,56,56,56,0,0,0,0,0,56,56,56,56,56,56,56,56,56,56,
+56,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,56,56,56,56,56,56,56,56,56,56,56,56,56,56,0,0,0,0,0,56,56,56,56,56,56,56,56,56,56,56,56,56,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,56,56,56,56,56,56,0,0,0,0,0,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,0,0,0,0,0,56,56,56,56,56,56,56,
+56,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,56,56,56,56,56,56,56,56,56,56,56,56,56,0,0,0,0,0,0,56,56,56,56,56,56,56,56,56,56,56,56,56,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,56,56,56,56,23,23,23,56,56,56,56,56,56,56,56,56,56,56,23,23,23,56,56,56,56,56,56,56,56,56,56,23,23,23,56,56,56,56,56,
+56,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,11,11,11,11,11,17,11,11,11,11,11,11,11,11,11,11,11,11,11,17,11,11,11,11,11,11,11,11,11,11,11,11,17,11,11,11,11,11,56,
+56,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,56,
+56,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,56,
+layer2
diff --git a/rc.c b/rc.c
index 1081163..0727cb2 100644
--- a/rc.c
+++ b/rc.c
@@ -5342,8 +5342,8 @@ int dofruiteffect(sprite_t *s) {
 		sprintf(tempm, "Armour!");
 		addoutlinetext(s->x,s->y - s->img->h/2, TEXTSIZE_POINTS, tempm,&white,&black,POINTSDELAY, TT_NORM);
 		// add puffs
-		for (xx = s->x - TILEW; xx <= s->x + TILEW; xx += TILEW) {
-			for (yy = s->y - TILEW*2; yy <= s->y; yy += TILEH) {
+		for (xx = player->x - TILEW; xx <= player->x + TILEW; xx += TILEW) {
+			for (yy = player->y - TILEW*2; yy <= player->y; yy += TILEH) {
 				puffin(-1, xx, yy, "nothing", 0);
 			}
 		}
@@ -5639,6 +5639,9 @@ int dofruiteffect(sprite_t *s) {
 		gunorigy = player->y;
 		guntime = 10;
 		gundelay = 0; // used to control shooting speed
+		// turn off netting etc
+		player->netting = B_FALSE;
+		player->slamming = B_FALSE;
 		player->powerup = PW_GUNNER;
 		return B_TRUE;
 	} else if (s->id == P_ZAPPOWERUP) {