diff options
author | Joseph-Eugene Winzer | 2017-08-29 01:13:47 +0200 |
---|---|---|
committer | Thierry Crozat | 2018-01-23 01:53:00 +0000 |
commit | 9b064e364f77fe114712c145fb094bc6fb0ea569 (patch) | |
tree | 280429bab49dcc5eff5661c7377b22447aa25dac /engines/supernova/msn_def.h | |
parent | 1af00170b42a20e0c507ff288155d7fda5c5db37 (diff) | |
download | scummvm-rg350-9b064e364f77fe114712c145fb094bc6fb0ea569.tar.gz scummvm-rg350-9b064e364f77fe114712c145fb094bc6fb0ea569.tar.bz2 scummvm-rg350-9b064e364f77fe114712c145fb094bc6fb0ea569.zip |
SUPERNOVA: Adds room id to objects
This commit helps especially during serialization of the inventory to
determine which room the object belongs to.
Diffstat (limited to 'engines/supernova/msn_def.h')
-rw-r--r-- | engines/supernova/msn_def.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index 88b59fa4c8..a84c28cbc9 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -433,6 +433,7 @@ struct Object { : _name("") , _description(Object::defaultDescription) , _id(INVALIDOBJECT) + , _roomId(NULLROOM) , _type(NULLTYPE) , _click(0) , _click2(0) @@ -440,11 +441,12 @@ struct Object { , _exitRoom(NULLROOM) , _direction(0) {} - Object(const char *name, const char *description, ObjectID id, ObjectType type, + Object(byte roomId, const char *name, const char *description, ObjectID id, ObjectType type, byte click, byte click2, byte section = 0, RoomID exitRoom = NULLROOM, byte direction = 0) : _name(name) , _description(description) , _id(id) + , _roomId(roomId) , _type(type) , _click(click) , _click2(click2) @@ -483,6 +485,7 @@ struct Object { return false; } + byte _roomId; Common::String _name; Common::String _description; ObjectID _id; |