OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- allow specifying specials in ZSDF by name.

Browse source 
- allow specifying a decal ID by name in UDMF.
This commit is contained in:
Christoph Oelckers 2017-02-26 17:05:04 +01:00
commit f31ddbc57c
4 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/g_shared/a_decals.cpp
View file

@ -751,14 +751,23 @@ IMPLEMENT_CLASS(ADecal, false, false)
void ADecal::BeginPlay ()
{
const FDecalTemplate *tpl;
const FDecalTemplate *tpl = nullptr;
Super::BeginPlay ();
int decalid = args[0] + (args[1] << 8); // [KS] High byte for decals.
if (args[0] < 0)
{
FName name = ENamedName(-args[0]);
tpl = DecalLibrary.GetDecalByName(name.GetChars());
}
else
{
int decalid = args[0] + (args[1] << 8); // [KS] High byte for decals.
tpl = DecalLibrary.GetDecalByNum(decalid);
}
// If no decal is specified, don't try to create one.
if (decalid != 0 && (tpl = DecalLibrary.GetDecalByNum (decalid)) != 0)
if (tpl != nullptr)
{
if (!tpl->PicNum.Exists())
{