OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'asmjit' into weapon_scriptification

Browse source 
# Conflicts:
#	src/gi.cpp
#	wadsrc/static/zscript/base.txt
This commit is contained in:
Christoph Oelckers 2018-11-26 00:14:44 +01:00
commit 47b1fa774d
51 changed files with 1809 additions and 1239 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/fragglescript/t_func.cpp
View file

@ -3833,7 +3833,7 @@ void FParser::SF_SetColor(void)
{
if (!DFraggleThinker::ActiveThinker->setcolormaterial)
{
level.sectors[i].SetColor(color.r, color.g, color.b, 0);
level.sectors[i].SetColor(color, 0);
}
else
{