zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-03 02:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@741 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2010-02-11 17:10:12 +00:00
parent 42b7dbf91e
commit 95f2bb538d
1 changed files with 1 additions and 1 deletions
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: