diff options
| author | Paul Gilbert | 2016-03-24 07:49:59 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-24 07:49:59 -0400 |
| commit | 66e198d665a8aacd1724848a40e6533f3d5cfebc (patch) | |
| tree | 549c1414ea83683eb9c75ba5eea7d3d07733009a /engines/titanic/messages/messages.cpp | |
| parent | 2f532c086d5cd466a54763fc4fee14d0940e0abb (diff) | |
| download | scummvm-rg350-66e198d665a8aacd1724848a40e6533f3d5cfebc.tar.gz scummvm-rg350-66e198d665a8aacd1724848a40e6533f3d5cfebc.tar.bz2 scummvm-rg350-66e198d665a8aacd1724848a40e6533f3d5cfebc.zip | |
TITANIC: Cleanup and fixes for message hierarchy
Diffstat (limited to 'engines/titanic/messages/messages.cpp')
| -rw-r--r-- | engines/titanic/messages/messages.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/messages/messages.cpp b/engines/titanic/messages/messages.cpp index 9202305353..28b8856578 100644 --- a/engines/titanic/messages/messages.cpp +++ b/engines/titanic/messages/messages.cpp @@ -39,7 +39,7 @@ void CMessage::load(SimpleFile *file) { CSaveableObject::load(file); } -bool CMessage::execute(CTreeItem *target, const ClassDef *classDef, int flags) const { +bool CMessage::execute(CTreeItem *target, const ClassDef *classDef, int flags) { // If no target was specified, then there's nothing to do if (!target) return false; @@ -51,7 +51,7 @@ bool CMessage::execute(CTreeItem *target, const ClassDef *classDef, int flags) c if (flags & MSGFLAG_SCAN) nextItem = item->scan(target); - if (!(flags & MSGFLAG_CLASS_DEF) || item->isInstanceOf(classDef)) { + if (!classDef || item->isInstanceOf(classDef)) { bool handled = perform(item); if (handled) { |