From 113a438b0110d22beb2a2e1e8ab0d64c019a8801 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Thu, 11 Feb 2010 17:10:01 +0000
Subject: [PATCH] - Fixed: Voodoo dolls must not check reactiontime in
 P_SlideMove.

SVN r2153 (trunk)
---
 src/p_map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_map.cpp b/src/p_map.cpp
index b7f8c04f17..ebcb701f68 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -2346,7 +2346,7 @@ void FSlide::SlideMove (AActor *mo, fixed_t tryx, fixed_t tryy, int numsteps)
 	hitcount = 3;
 	slidemo = mo;
 
-	if (mo->player && mo->reactiontime > 0)
+	if (mo->player && mo->player->mo == mo && mo->reactiontime > 0)
 		return;	// player coming right out of a teleporter.
 	
   retry: