From a5c3c95b2fff6c2b430f7f663973bd2274a01cdb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 19 Feb 2010 08:10:04 +0000 Subject: [PATCH] - added 2 DECORATE keywords from Skulltag as dummies. SVN r2169 (trunk) --- src/thingdef/thingdef_data.cpp | 2 ++ src/thingdef/thingdef_properties.cpp | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/thingdef/thingdef_data.cpp b/src/thingdef/thingdef_data.cpp index 8af93f0bd..87ac4f198 100644 --- a/src/thingdef/thingdef_data.cpp +++ b/src/thingdef/thingdef_data.cpp @@ -310,6 +310,7 @@ static FFlagDef WeaponFlags[] = DEFINE_FLAG(WIF, NOAUTOAIM, AWeapon, WeaponFlags), DEFINE_DUMMY_FLAG(NOLMS), + DEFINE_DUMMY_FLAG(ALLOW_WITH_RESPAWN_INVUL), }; static FFlagDef PlayerPawnFlags[] = @@ -613,3 +614,4 @@ void InitThingdef() qsort(&variables[0], variables.Size(), sizeof(variables[0]), varcmp); } } + diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp index cd2537db0..884e596e2 100644 --- a/src/thingdef/thingdef_properties.cpp +++ b/src/thingdef/thingdef_properties.cpp @@ -1570,6 +1570,15 @@ DEFINE_CLASS_PROPERTY(slotpriority, F, Weapon) info->Class->Meta.SetMetaFixed(AWMETA_SlotPriority, i); } +//========================================================================== +// +//========================================================================== +DEFINE_CLASS_PROPERTY(preferredskin, S, Weapon) +{ + PROP_STRING_PARM(str, 0); + // NoOp - only for Skulltag compatibility +} + //========================================================================== // //==========================================================================