aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2016-12-01 21:49:15 -0500
committerPaul Gilbert2016-12-01 21:49:15 -0500
commit0b64923b827bd05b14e56aa58f742726c33390f3 (patch)
treeb8edb85241f5a36574285f60206638655afd81b9 /engines
parent3c35ae36d4db1ac036373c3300d4443aee62aad8 (diff)
downloadscummvm-rg350-0b64923b827bd05b14e56aa58f742726c33390f3.tar.gz
scummvm-rg350-0b64923b827bd05b14e56aa58f742726c33390f3.tar.bz2
scummvm-rg350-0b64923b827bd05b14e56aa58f742726c33390f3.zip
TITANIC: Fix succubus registering mail receipt
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/npcs/succubus.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index 806b144684..956f2ca1b2 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -479,8 +479,8 @@ bool CSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
break;
}
} else {
- CGameObject *mailObject = findMailByFlags(compareRoomNameTo("Titania")
- ? 3 : _field140, petRoomFlags);
+ CGameObject *mailObject = findMailByFlags(
+ _v3 && compareRoomNameTo("Titania") ? 3 : _field140, petRoomFlags);
if (!mailObject) {
if (getRandomNumber(1) == 0) {
startTalking(this, 70104, findView());
@@ -492,6 +492,7 @@ bool CSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
playMovie(_startFrame7, _endFrame7, 0);
petDisplayMessage(2, NOTHING_TO_DELIVER);
} else {
+ _mailP = mailObject;
startTalking(this, 230004, findView());
if (_startFrame4 >= 0) {