zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_map.cpp
View File

@ -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: