OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript

Browse source 
# Conflicts:
#	wadsrc/static/zscript.txt
This commit is contained in:
Christoph Oelckers 2016-12-03 18:51:10 +01:00
commit fbc8d0e83c
93 changed files with 1300 additions and 982 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/textures/multipatchtexture.cpp
View file

@ -1098,7 +1098,7 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part, TexInit &init)
if (!sc.CheckNumber())
{
sc.MustGetString();
part.Blend = V_GetColor(NULL, sc.String);
part.Blend = V_GetColor(NULL, sc);
}
else
{