diff options
| author | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
| commit | f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7 (patch) | |
| tree | 771a8d2b3fddf96c17a1d81d42cb08dfba09d110 /engines/fullpipe/messages.cpp | |
| parent | 873d555add9aaf5eb0d021518f5134142e2c2ff6 (diff) | |
| parent | 5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a (diff) | |
| download | scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.gz scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.bz2 scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/fullpipe/messages.cpp')
| -rw-r--r-- | engines/fullpipe/messages.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp index a7337b98ed..9085e92832 100644 --- a/engines/fullpipe/messages.cpp +++ b/engines/fullpipe/messages.cpp @@ -57,7 +57,7 @@ ExCommand::ExCommand(int16 parentId, int messageKind, int messageNum, int x, int } bool ExCommand::load(MfcArchive &file) { - debug(5, "ExCommand::load()"); + debugC(5, kDebugLoading, "ExCommand::load()"); _parentId = file.readUint16LE(); _messageKind = file.readUint32LE(); @@ -247,7 +247,7 @@ ObjstateCommand::~ObjstateCommand() { } bool ObjstateCommand::load(MfcArchive &file) { - debug(5, "ObjStateCommand::load()"); + debugC(5, kDebugLoading, "ObjStateCommand::load()"); _objtype = kObjTypeObjstateCommand; @@ -341,7 +341,7 @@ MessageQueue::~MessageQueue() { } bool MessageQueue::load(MfcArchive &file) { - debug(5, "MessageQueue::load()"); + debugC(5, kDebugLoading, "MessageQueue::load()"); _dataId = file.readUint16LE(); @@ -457,7 +457,7 @@ void MessageQueue::deleteExCommandByIndex(uint idx, bool doFree) { _exCommands.erase(it); } -void MessageQueue::transferExCommands(MessageQueue *mq) { +void MessageQueue::mergeQueue(MessageQueue *mq) { // Original belongs to AniHandler while (mq->_exCommands.size()) { _exCommands.push_back(mq->_exCommands.front()); mq->_exCommands.pop_front(); |