OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into asmjit

Browse source 
# Conflicts:
#	src/p_actionfunctions.cpp
This commit is contained in:
Christoph Oelckers 2018-11-18 21:08:16 +01:00
commit 8bc2d50ad2
6 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_lnspec.cpp
View file

@ -1764,7 +1764,7 @@ FUNC(LS_Thing_Raise)
if (arg0==0)
{
ok = P_Thing_Raise (it,NULL, arg1);
ok = P_Thing_Raise (it, it, arg1);
}
else
{
@ -1772,7 +1772,7 @@ FUNC(LS_Thing_Raise)
while ( (target = iterator.Next ()) )
{
ok |= P_Thing_Raise(target,NULL, arg1);
ok |= P_Thing_Raise(target, target, arg1);
}
}
return ok;