SUPERNOVA: Fix combining ObjectType enum values

It was storing the result of bitwise operation on the ObjectType
enum values in a ObjectType variable. But that was incorrect as
the result was not a value from the enum.

Also removing a property was actually adding the property if it
was not present in the value initially.

1 files changed, 3 insertions, 2 deletions

diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h
index 0cca058bba..eda835eb75 100644
--- a/engines/supernova/msn_def.h
+++ b/engines/supernova/msn_def.h
@@ -330,6 +330,7 @@ enum ObjectType {
 	OCCUPIED    =   2048,
 	CAUGHT      =   4096
 };
+typedef uint16 ObjectTypes;
 
 enum Action {
 	ACTION_WALK,
@@ -613,7 +614,7 @@ struct Object {
 	}
 
 	void disableProperty(ObjectType type) {
-		_type ^= type;
+		_type &= ~type;
 	}
 
 	bool hasProperty(ObjectType type) const {
@@ -632,7 +633,7 @@ struct Object {
 	StringID _name;
 	StringID _description;
 	ObjectID _id;
-	ObjectType _type;
+	ObjectTypes _type;
 	byte _click;
 	byte _click2;
 	byte _section;