diff options
| author | Joseph-Eugene Winzer | 2018-03-09 11:20:47 +0100 |
|---|---|---|
| committer | Joseph-Eugene Winzer | 2018-03-11 23:25:00 +0100 |
| commit | a38db245ed349e1088dbeec8c41dd0c4c7549ade (patch) | |
| tree | 982313561dd30b86e6983bd6f92a189cd4f21ec9 /engines/supernova/msn_def.h | |
| parent | 0770800844854ade735524b33e04b0a7858eefe7 (diff) | |
| download | scummvm-rg350-a38db245ed349e1088dbeec8c41dd0c4c7549ade.tar.gz scummvm-rg350-a38db245ed349e1088dbeec8c41dd0c4c7549ade.tar.bz2 scummvm-rg350-a38db245ed349e1088dbeec8c41dd0c4c7549ade.zip | |
SUPERNOVA: Fixes formatting
Because of confusion when indentation level is raised and thus tabs or
spaces should be used when aligning code, this commit switches to tabs
to avoid any further confusion.
Diffstat (limited to 'engines/supernova/msn_def.h')
| -rw-r--r-- | engines/supernova/msn_def.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index c2086cd4f8..c18baa068c 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -583,7 +583,7 @@ struct Object { , _direction(0) {} Object(byte roomId, StringID name, StringID description, ObjectID id, ObjectType type, - byte click, byte click2, byte section = 0, RoomID exitRoom = NULLROOM, byte direction = 0) + byte click, byte click2, byte section = 0, RoomID exitRoom = NULLROOM, byte direction = 0) : _name(name) , _description(description) , _id(id) @@ -621,7 +621,7 @@ struct Object { static bool combine(Object &obj1, Object &obj2, ObjectID id1, ObjectID id2) { if (obj1.hasProperty(COMBINABLE)) return (((obj1._id == id1) && (obj2._id == id2)) || - ((obj1._id == id2) && (obj2._id == id1))); + ((obj1._id == id2) && (obj2._id == id1))); else return false; } |