zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-15 15:11:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

DECORATE cleanup

Browse source 
- Remove some ExpVal stuff that wasn't used.
This commit is contained in:
Randy Heit 2013-08-23 22:17:08 -05:00
parent 2f7183b937
commit 956d754804
2 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/thingdef/thingdef_exp.h
View file

@ -164,36 +164,10 @@ struct ExpVal
return (Type == VAL_Int || Type == VAL_Sound) ? !!Int : Type == VAL_Float? Float!=0. : false; return (Type == VAL_Int || Type == VAL_Sound) ? !!Int : Type == VAL_Float? Float!=0. : false;
} }
template<class T> 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 FName GetName() const
{ {
return Type == VAL_Name? ENamedName(Int) : NAME_None; 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 struct ExpEmit

1
src/thingdef/thingdef_type.h
View file

@ -14,7 +14,6 @@ enum ExpValType
VAL_Array, // Array (very limited right now) VAL_Array, // Array (very limited right now)
VAL_Object, // Object reference VAL_Object, // Object reference
VAL_Class, // Class 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_Sound, // Sound identifier. Internally it's an int.
VAL_Name, // A Name VAL_Name, // A Name
VAL_String, // A string VAL_String, // A string