From 956d754804cf2c51926d9f5620608f15e6a63aaf Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 23 Aug 2013 22:17:08 -0500 Subject: [PATCH] DECORATE cleanup - Remove some ExpVal stuff that wasn't used. --- src/thingdef/thingdef_exp.h | 26 -------------------------- src/thingdef/thingdef_type.h | 1 - 2 files changed, 27 deletions(-) diff --git a/src/thingdef/thingdef_exp.h b/src/thingdef/thingdef_exp.h index 0c7cfcfa7..1b3e5d854 100644 --- a/src/thingdef/thingdef_exp.h +++ b/src/thingdef/thingdef_exp.h @@ -164,36 +164,10 @@ struct ExpVal return (Type == VAL_Int || Type == VAL_Sound) ? !!Int : Type == VAL_Float? Float!=0. : false; } - template T *GetPointer() const - { - return Type == VAL_Object || Type == VAL_Pointer? (T*)pointer : NULL; - } - - FSoundID GetSoundID() const - { - return Type == VAL_Sound? Int : 0; - } - - int GetColor() const - { - return Type == VAL_Color? Int : 0; - } - FName GetName() const { return Type == VAL_Name? ENamedName(Int) : NAME_None; } - - FState *GetState() const - { - return Type == VAL_State? (FState*)pointer : NULL; - } - - const PClass *GetClass() const - { - return Type == VAL_Class? (const PClass *)pointer : NULL; - } - }; struct ExpEmit diff --git a/src/thingdef/thingdef_type.h b/src/thingdef/thingdef_type.h index a89c80749..706b2ba7a 100644 --- a/src/thingdef/thingdef_type.h +++ b/src/thingdef/thingdef_type.h @@ -14,7 +14,6 @@ enum ExpValType VAL_Array, // Array (very limited right now) VAL_Object, // Object reference VAL_Class, // Class reference - VAL_Pointer, // Dereferenced variable (only used for addressing arrays for now.) VAL_Sound, // Sound identifier. Internally it's an int. VAL_Name, // A Name VAL_String, // A string