- Fixed: Voodoo dolls must not check reactiontime in P_SlideMove.

SVN r2153 (trunk)
This commit is contained in:
Christoph Oelckers 2010-02-11 17:10:01 +00:00
parent 12a819cf7c
commit 113a438b01

View file

@ -2346,7 +2346,7 @@ void FSlide::SlideMove (AActor *mo, fixed_t tryx, fixed_t tryy, int numsteps)
hitcount = 3; hitcount = 3;
slidemo = mo; 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. return; // player coming right out of a teleporter.
retry: retry: