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-11-30 18:46:23 +01:00
commit c927aca2a0
400 changed files with 27625 additions and 25589 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/textures/multipatchtexture.cpp
View file

@ -1335,6 +1335,7 @@ void FMultiPatchTexture::ResolvePatches()
{
if (Inits[i].HasLine) Inits[i].sc.Message(MSG_WARNING, "Texture '%s' references itself as patch\n", Inits[i].TexName.GetChars());
else Printf(TEXTCOLOR_YELLOW "Texture '%s' references itself as patch\n", Inits[i].TexName.GetChars());
continue;
}
else
{