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.h | |
| 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.h')
| -rw-r--r-- | engines/fullpipe/messages.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h index e6f7f05150..67fbb2a6cd 100644 --- a/engines/fullpipe/messages.h +++ b/engines/fullpipe/messages.h @@ -142,7 +142,7 @@ class MessageQueue : public CObject { ExCommand *getExCommandByIndex(uint idx); void deleteExCommandByIndex(uint idx, bool doFree); - void transferExCommands(MessageQueue *mq); + void mergeQueue(MessageQueue *mq); void replaceKeyCode(int key1, int key2); |