diff options
| author | Max Horn | 2006-08-21 10:04:04 +0000 |
|---|---|---|
| committer | Max Horn | 2006-08-21 10:04:04 +0000 |
| commit | 2c0967e7bbceaba1bb248f6c07ed78e21795711b (patch) | |
| tree | 80e9caf522cecf1ba98db003d6e9363c1a26adc9 /engines/scumm/script_v5.cpp | |
| parent | 0616d4931a7114b7da292bc8323bf20d28737b93 (diff) | |
| download | scummvm-rg350-2c0967e7bbceaba1bb248f6c07ed78e21795711b.tar.gz scummvm-rg350-2c0967e7bbceaba1bb248f6c07ed78e21795711b.tar.bz2 scummvm-rg350-2c0967e7bbceaba1bb248f6c07ed78e21795711b.zip | |
cleanup & check for sentence overflows
svn-id: r23736
Diffstat (limited to 'engines/scumm/script_v5.cpp')
| -rw-r--r-- | engines/scumm/script_v5.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index 6a714d0737..c393050c8d 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -746,7 +746,6 @@ void ScummEngine_v5::o5_divide() { void ScummEngine_v5::o5_doSentence() { int verb; - SentenceTab *st; verb = getVarOrDirectByte(PARAM_1); if (verb == 0xFE) { @@ -756,13 +755,9 @@ void ScummEngine_v5::o5_doSentence() { return; } - st = &_sentence[_sentenceNum++]; - - st->verb = verb; - st->objectA = getVarOrDirectWord(PARAM_2); - st->objectB = getVarOrDirectWord(PARAM_3); - st->preposition = (st->objectB != 0); - st->freezeCount = 0; + int objectA = getVarOrDirectWord(PARAM_2); + int objectB = getVarOrDirectWord(PARAM_3); + doSentence(verb, objectA, objectB); } void ScummEngine_v5::o5_drawBox() { |