From 09868d29995a4505508135fbf571b90cd77452ea Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Wed, 25 Sep 2019 16:32:06 +0800
Subject: [PATCH] Dust devil fixes

---
 src/p_enemy.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/p_enemy.c b/src/p_enemy.c
index bc3665237..4dd077ce5 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -13104,11 +13104,14 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
 		if (dustdevil->height - pos > thresh)
 		{
 			fixed_t dist = FixedHypot(thing->x - dustdevil->x, thing->y - dustdevil->y);
-			fixed_t dragamount = 6 * FRACUNIT;
+			fixed_t dragamount = player->speed;
 			fixed_t x, y;
 
 			if (player->powers[pw_nocontrol] == 0)
+			{
+				P_ResetPlayer(player);
 				A_PlayActiveSound(dustdevil);
+			}
 			player->powers[pw_nocontrol] = 2;
 			player->drawangle += ANG20;
 			P_SetPlayerMobjState(thing, S_PLAY_PAIN);