diff options
| author | James Brown | 2003-05-22 12:30:19 +0000 |
|---|---|---|
| committer | James Brown | 2003-05-22 12:30:19 +0000 |
| commit | 766b7856afb3b673f4c8f7a76847f855d66e9e8c (patch) | |
| tree | 7fa0254825fab64e89cb486296d391aa9fe7e335 | |
| parent | aafa8c072217cfe5cef3f8dda25e8812780b49be (diff) | |
| download | scummvm-rg350-766b7856afb3b673f4c8f7a76847f855d66e9e8c.tar.gz scummvm-rg350-766b7856afb3b673f4c8f7a76847f855d66e9e8c.tar.bz2 scummvm-rg350-766b7856afb3b673f4c8f7a76847f855d66e9e8c.zip | |
Fix sentence building
svn-id: r7824
| -rw-r--r-- | scumm/script_v2.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index eb5456dea1..8001eab6b0 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -867,18 +867,15 @@ void Scumm_v2::o2_doSentence() { case 1: // Execute the sentence _sentenceNum--; - //warning("TODO o2_doSentence(%d, %d, %d): execute", st->verb, st->objectA, st->objectB); - - // FIXME / TODO: The following is hackish, and probably incomplete, but it works somewhat. - VAR(VAR_ACTIVE_VERB) = st->verb; - VAR(VAR_ACTIVE_OBJECT1) = st->objectA; - VAR(VAR_ACTIVE_OBJECT2) = st->objectB; - if (st->verb == 250) - runObjectScript(st->objectA, 253, false, true, NULL); - else - runObjectScript(st->objectA, st->verb, false, false, NULL); + if (st->verb != 250) { + VAR(VAR_ACTIVE_VERB) = st->verb; + VAR(VAR_ACTIVE_OBJECT1) = st->objectA; + VAR(VAR_ACTIVE_OBJECT2) = st->objectB; + runObjectScript(st->objectA, st->verb, false, false, NULL); + } else + runObjectScript(st->objectA, 253, false, true, NULL); break; case 2: // Print the sentence |