diff options
| author | Paul Gilbert | 2016-12-16 19:24:35 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-16 19:24:35 -0500 |
| commit | 2900c631900e320155e7a18135b1060d65482315 (patch) | |
| tree | 3ccb1df55a4be18ec23ec015ecd81003bbdb07a5 | |
| parent | bf092458b5c947df7c85114d011c42a0f7a52325 (diff) | |
| download | scummvm-rg350-2900c631900e320155e7a18135b1060d65482315.tar.gz scummvm-rg350-2900c631900e320155e7a18135b1060d65482315.tar.bz2 scummvm-rg350-2900c631900e320155e7a18135b1060d65482315.zip | |
TITANIC: Fix null pointer crash talking to Deskbot
| -rw-r--r-- | engines/titanic/true_talk/tt_sentence.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/true_talk/tt_sentence.cpp b/engines/titanic/true_talk/tt_sentence.cpp index 451582383d..8d897aaa38 100644 --- a/engines/titanic/true_talk/tt_sentence.cpp +++ b/engines/titanic/true_talk/tt_sentence.cpp @@ -212,7 +212,7 @@ bool TTsentence::fn2(int slotIndex, const TTstring &str, const TTconceptNode *no if (g_vm->_exeResources._owner->_concept1P && (slotIndex == 0 || slotIndex == 2 || slotIndex == 3 || slotIndex == 4 || slotIndex == 5)) { - if (str == g_vm->_exeResources._owner->_concept2P->getText() && + if (str == g_vm->_exeResources._owner->_concept1P->getText() && (conceptText == "it" || conceptText == "that" || conceptText == "he" || conceptText == "she" || conceptText == "him" || conceptText == "her" || conceptText == "them" || conceptText == "they" || conceptText == "those" || @@ -221,7 +221,7 @@ bool TTsentence::fn2(int slotIndex, const TTstring &str, const TTconceptNode *no } if (g_vm->_exeResources._owner->_concept1P && (slotIndex == 0 || slotIndex == 2)) { - if (conceptText == "?" && str == g_vm->_exeResources._owner->_concept2P->getText()) { + if (conceptText == "?" && str == g_vm->_exeResources._owner->_concept1P->getText()) { delete concept; concept = getFrameSlot(5, node); conceptText = concept->getText(); |