zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-16 01:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Gaerzi/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-04-24 09:41:54 +02:00
commit 3f8c7239af
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_acs.cpp
View file

@ -3546,6 +3546,8 @@ static const int LegacyRenderStyleIndices[] =
65, // STYLE_Add, 65, // STYLE_Add,
66, // STYLE_Shaded, 66, // STYLE_Shaded,
67, // STYLE_TranslucentStencil, 67, // STYLE_TranslucentStencil,
68, // STYLE_Shadow,
69, // STYLE_Subtract,
-1 -1
}; };

6
src/thingdef/thingdef_properties.cpp
View file

@ -796,11 +796,13 @@ DEFINE_PROPERTY(renderstyle, S, Actor)
{ {
PROP_STRING_PARM(str, 0); PROP_STRING_PARM(str, 0);
static const char * renderstyles[]={ static const char * renderstyles[]={
"NONE", "NORMAL", "FUZZY", "SOULTRANS", "OPTFUZZY", "STENCIL", "TRANSLUCENT", "ADD", "SHADED", "SUBTRACT", NULL }; "NONE", "NORMAL", "FUZZY", "SOULTRANS", "OPTFUZZY", "STENCIL",
"TRANSLUCENT", "ADD", "SHADED", "SHADOW", "SUBTRACT", NULL };
static const int renderstyle_values[]={ static const int renderstyle_values[]={
STYLE_None, STYLE_Normal, STYLE_Fuzzy, STYLE_SoulTrans, STYLE_OptFuzzy, STYLE_None, STYLE_Normal, STYLE_Fuzzy, STYLE_SoulTrans, STYLE_OptFuzzy,
STYLE_TranslucentStencil, STYLE_Translucent, STYLE_Add, STYLE_Shaded, STYLE_Subtract}; STYLE_TranslucentStencil, STYLE_Translucent, STYLE_Add, STYLE_Shaded,
STYLE_Shadow, STYLE_Subtract};
// make this work for old style decorations, too. // make this work for old style decorations, too.
if (!strnicmp(str, "style_", 6)) str+=6; if (!strnicmp(str, "style_", 6)) str+=6;