cleanup & check for sentence overflows

svn-id: r23736
This commit is contained in:
Max Horn 2006-08-21 10:04:04 +00:00
parent 0616d4931a
commit 2c0967e7bb
2 changed files with 15 additions and 17 deletions

View file

@ -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() {