OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'NewEESpecials'

Browse source 
# Conflicts:
#	src/fragglescript/t_fs.h
This commit is contained in:
Christoph Oelckers 2016-02-05 01:01:39 +01:00
commit 0b7a06c714
19 changed files with 404 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/thingdef/thingdef_expression.cpp
View file

@ -3007,7 +3007,7 @@ int DecoCallLineSpecial(VMFrameStack *stack, VMValue *param, int numparam, VMRet
{
v[i - 2] = param[i].i;
}
ret->SetInt(LineSpecials[param[0].i](NULL, reinterpret_cast<AActor*>(param[1].a), false, v[0], v[1], v[2], v[3], v[4]));
ret->SetInt(P_ExecuteSpecial(param[0].i, NULL, reinterpret_cast<AActor*>(param[1].a), false, v[0], v[1], v[2], v[3], v[4]));
return 1;
}