diff options
| author | Paul Gilbert | 2016-10-29 18:39:30 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-10-29 18:39:30 -0400 |
| commit | 43dc1c6f954b060e765ab506904781f69d8732f7 (patch) | |
| tree | deee5ec533192fbe0a1c1405a5626f5a3e7ed5c8 | |
| parent | fae906b539895ebf6b03c9ccb6090b07efc38d38 (diff) | |
| download | scummvm-rg350-43dc1c6f954b060e765ab506904781f69d8732f7.tar.gz scummvm-rg350-43dc1c6f954b060e765ab506904781f69d8732f7.tar.bz2 scummvm-rg350-43dc1c6f954b060e765ab506904781f69d8732f7.zip | |
TITANIC: Fix to Doorbot talking animations selection
| -rw-r--r-- | engines/titanic/npcs/doorbot.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 567f7a5af8..247a8201b3 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -340,11 +340,17 @@ bool CDoorbot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) { if (msg->_value2 != 2) { if (_npcFlags & NPCFLAG_200000) { - if (_introMovieNum == 8 || _field110) { + switch (_introMovieNum) { + case 8: + case 10: msg->_names = NAMES2; - } else if (_introMovieNum == 9) { + break; + case 9: msg->_names = NAMES3; _introMovieNum = 10; + break; + default: + break; } } else if (_npcFlags & (NPCFLAG_100000 | NPCFLAG_400000)) { msg->_names = NAMES1; |