Merge branch 'master' into asmjit

This commit is contained in:
Christoph Oelckers 2018-11-17 20:16:03 +01:00
commit 533f66396d
11 changed files with 211 additions and 161 deletions

View file

@ -463,7 +463,7 @@ bool P_Thing_Raise(AActor *thing, AActor *raiser, int nocheck)
return false;
}
if (!P_CanResurrect(thing, raiser))
if (!P_CanResurrect(raiser, thing))
return false;
S_Sound (thing, CHAN_BODY, "vile/raise", 1, ATTN_IDLE);