OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into float

Browse source 
# Conflicts:
#	src/g_heretic/a_hereticweaps.cpp
#	src/p_map.cpp
#	src/p_mobj.cpp
#	src/p_things.cpp
#	src/portal.cpp
This commit is contained in:
Christoph Oelckers 2016-03-15 00:16:13 +01:00
commit c64eee5b15
104 changed files with 1206 additions and 1073 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/fragglescript/t_func.cpp
View file

@ -1335,11 +1335,11 @@ void FParser::SF_MobjMomx(void)
if(t_argc > 1)
{
if(mo)
mo->velx = fixedvalue(t_argv[1]);
mo->vel.x = fixedvalue(t_argv[1]);
}
t_return.type = svt_fixed;
t_return.value.f = mo ? mo->velx : 0;
t_return.value.f = mo ? mo->vel.x : 0;
}
}
@ -1359,11 +1359,11 @@ void FParser::SF_MobjMomy(void)
if(t_argc > 1)
{
if(mo)
mo->vely = fixedvalue(t_argv[1]);
mo->vel.y = fixedvalue(t_argv[1]);
}
t_return.type = svt_fixed;
t_return.value.f = mo ? mo->vely : 0;
t_return.value.f = mo ? mo->vel.y : 0;
}
}
@ -1383,11 +1383,11 @@ void FParser::SF_MobjMomz(void)
if(t_argc > 1)
{
if(mo)
mo->velz = fixedvalue(t_argv[1]);
mo->vel.z = fixedvalue(t_argv[1]);
}
t_return.type = svt_fixed;
t_return.value.f = mo ? mo->velz : 0;
t_return.value.f = mo ? mo->vel.z : 0;
}
}