thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TITANIC: Cleanup and fixes for message hierarchy

Browse source
This commit is contained in:
Paul Gilbert 2016-03-24 07:49:59 -04:00
parent 2f532c086d
commit 66e198d665
78 changed files with 160 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/titanic/messages/messages.cpp
View file

@ -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) {