diff options
| author | Joseph-Eugene Winzer | 2017-06-16 10:25:41 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-22 23:08:39 +0000 |
| commit | f2e51c3cfe0a6c1ae2794d5eee54dba4da0ba201 (patch) | |
| tree | a8411f441dafc5700cbde301b609f9c363669ca0 /engines/supernova/msn_def.h | |
| parent | f4eb7cbfc5ad4d3c266406b2f93748365df9be95 (diff) | |
| download | scummvm-rg350-f2e51c3cfe0a6c1ae2794d5eee54dba4da0ba201.tar.gz scummvm-rg350-f2e51c3cfe0a6c1ae2794d5eee54dba4da0ba201.tar.bz2 scummvm-rg350-f2e51c3cfe0a6c1ae2794d5eee54dba4da0ba201.zip | |
SUPERNOVA: Adds hasProperty() for Objects and bit ops
Diffstat (limited to 'engines/supernova/msn_def.h')
| -rw-r--r-- | engines/supernova/msn_def.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index 1bd81ddc0f..d19dd1ed6a 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -371,8 +371,10 @@ enum ObjectID { }; ObjectType operator|(ObjectType a, ObjectType b); +ObjectType operator&(ObjectType a, ObjectType b); ObjectType operator^(ObjectType a, ObjectType b); ObjectType &operator|=(ObjectType &a, ObjectType b); +ObjectType &operator&=(ObjectType &a, ObjectType b); ObjectType &operator^=(ObjectType &a, ObjectType b); struct Object { @@ -410,6 +412,10 @@ struct Object { _type ^= type; } + bool hasProperty(ObjectType type) const { + return _type & type; + } + const char *_name; const char *_description; ObjectID _id; |