diff options
author | Travis Howell | 2006-04-15 06:42:40 +0000 |
---|---|---|
committer | Travis Howell | 2006-04-15 06:42:40 +0000 |
commit | 3d36a28296a79d49c109486a8236b1a3f7a9b18a (patch) | |
tree | b09cce9bb0b1e9978a61b75d778d6800914060d7 /engines/simon/items.cpp | |
parent | 647b318a97bc3afd73dc9b04934a36e6e6c1ba5e (diff) | |
download | scummvm-rg350-3d36a28296a79d49c109486a8236b1a3f7a9b18a.tar.gz scummvm-rg350-3d36a28296a79d49c109486a8236b1a3f7a9b18a.tar.bz2 scummvm-rg350-3d36a28296a79d49c109486a8236b1a3f7a9b18a.zip |
Adjust various number of textBox checks for FF
svn-id: r21902
Diffstat (limited to 'engines/simon/items.cpp')
-rw-r--r-- | engines/simon/items.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index e4e22c341a..327535130d 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -700,7 +700,7 @@ void SimonEngine::o_addTextBox() { int w = getVarOrWord(); int h = getVarOrWord(); int number = getVarOrByte(); - if (number < 20) + if (number < _numTextBoxes) defineBox(id, x, y, w, h, (number << 8) + 129, 208, _dummyItem2); } @@ -708,7 +708,7 @@ void SimonEngine::o_setShortText() { // 66: set item name uint var = getVarOrByte(); uint stringId = getNextStringID(); - if (var < 20) + if (var < _numTextBoxes) _stringIdArray2[var] = stringId; } @@ -718,12 +718,12 @@ void SimonEngine::o_setLongText() { uint stringId = getNextStringID(); if (getFeatures() & GF_TALKIE) { uint speechId = getNextWord(); - if (var < 20) { + if (var < _numTextBoxes) { _stringIdArray3[var] = stringId; _speechIdArray4[var] = speechId; } } else { - if (var < 20) { + if (var < _numTextBoxes) { _stringIdArray3[var] = stringId; } } @@ -1729,7 +1729,7 @@ void SimonEngine::o2_isShortText() { // 188: string2 is uint i = getVarOrByte(); uint str = getNextStringID(); - setScriptCondition(str < 20 && _stringIdArray2[i] == str); + setScriptCondition(str < _numTextBoxes && _stringIdArray2[i] == str); } void SimonEngine::o2_clearMarks() { @@ -1771,7 +1771,7 @@ void SimonEngine::o3_addTextBox() { w = getVarOrWord(); h = getVarOrWord(); num = getVarOrByte(); - if (num < 20) + if (num < _numTextBoxes) defineBox(id, x, y, w, h, flags + (num << 8), 208, _dummyItem1); } |