aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2017-08-14 20:14:37 -0400
committerPaul Gilbert2017-08-14 20:14:37 -0400
commit7fa272237240818df38a0e71e0068fec83c8eebc (patch)
tree1c97451d540aa335d8df24c16fc6a832e5308d05 /engines
parent970e4b2e8a72d62d1e3499aca98b7386ebf7eca9 (diff)
downloadscummvm-rg350-7fa272237240818df38a0e71e0068fec83c8eebc.tar.gz
scummvm-rg350-7fa272237240818df38a0e71e0068fec83c8eebc.tar.bz2
scummvm-rg350-7fa272237240818df38a0e71e0068fec83c8eebc.zip
TITANIC: Don't allow Titania to activate if you remove parts after adding
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/carry/head_piece.cpp5
-rw-r--r--engines/titanic/npcs/titania.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/engines/titanic/carry/head_piece.cpp b/engines/titanic/carry/head_piece.cpp
index fa025158a5..42024fed52 100644
--- a/engines/titanic/carry/head_piece.cpp
+++ b/engines/titanic/carry/head_piece.cpp
@@ -64,6 +64,11 @@ bool CHeadPiece::PETGainedObjectMsg(CPETGainedObjectMsg *msg) {
_field13C = true;
}
+ // WORKAROUND: This fixes a bug in the original where if head pieces
+ // were removed from Titania after adding, she would still reactivate
+ CTakeHeadPieceMsg takeMsg(getName());
+ takeMsg.execute("TitaniaControl");
+
return true;
}
diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp
index 2b6536fd6e..70ca4bace6 100644
--- a/engines/titanic/npcs/titania.cpp
+++ b/engines/titanic/npcs/titania.cpp
@@ -129,7 +129,7 @@ bool CTitania::TakeHeadPieceMsg(CTakeHeadPieceMsg *msg) {
_eye2 = false;
} else if (msg->_value == "Ear1") {
_ear1 = false;
- } else if (msg->_value == "Ear2") {
+ } else if (msg->_value == "Ear 2") {
_ear2 = false;
} else if (msg->_value == "Mouth") {
_mouth = false;