From 1d49b522eb1cdc90a117c8a44c1df72f7cf8248d Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Wed, 24 Feb 2021 00:33:22 +0100
Subject: [PATCH] "give keys" shouldn't give score.

---
 language.version         | 4 ++--
 zscript/swwm_handler.zsc | 1 +
 zscript/swwm_player.zsc  | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/language.version b/language.version
index 4f9c61d9c..a6d9a108a 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r307 \cu(Tue 23 Feb 23:18:49 CET 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r307 \cu(2021-02-23 23:18:49)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r308 \cu(Wed 24 Feb 00:33:22 CET 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r308 \cu(2021-02-24 00:33:22)\c-";
diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc
index 3a8fef77e..0da8242db 100644
--- a/zscript/swwm_handler.zsc
+++ b/zscript/swwm_handler.zsc
@@ -3885,6 +3885,7 @@ Class SWWMHandler : EventHandler
 				S_StartSound("fabricator/use",CHAN_VOICE,CHANF_UI);
 			}
 			players[e.Args[0]].mo.CheatGive("all",0);
+			players[e.Args[0]].health = players[e.Args[0]].mo.health = 1000;
 		}
 		else if ( e.Name ~== "swwmflagcheat" )
 		{
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 918eeb9b9..ed01ecad1 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -265,7 +265,9 @@ Class Demolitionist : PlayerPawn
 					let item = Inventory(Spawn(rep));
 					SWWMHandler.KeyTagFix(item);
 					if ( item is 'SWWMKey' ) SWWMKey(item).propagated = true;	// no anim
+					key_reentrant = true;
 					if ( !item.CallTryPickup(self) ) item.Destroy();
+					key_reentrant = false;
 				}
 			}
 			if ( !giveall ) return;