OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into floatcvt

Browse source 
# Conflicts:
#	src/p_acs.cpp
#	src/r_utility.cpp
#	src/thingdef/thingdef_codeptr.cpp
#	src/version.h
This commit is contained in:
Christoph Oelckers 2016-03-23 14:15:24 +01:00
commit 70d87f94f2
8 changed files with 182 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_acs.cpp
View file

@ -5790,6 +5790,8 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
argCount > 9 ? ACSToDouble(args[9]) : 1.0,
argCount > 10 ? ACSToDouble(args[10]) : 1.0,
argCount > 11 ? ACSToDouble(args[11]) : 1.0 );
argCount > 12 ? args[12] : 0,
argCount > 13 ? args[13] : 0);
}
case ACSF_SetLineActivation: