diff options
| -rw-r--r-- | scumm/saveload.cpp | 2 | ||||
| -rw-r--r-- | scumm/script.cpp | 6 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v5.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index ddabd7eb25..2e964e888b 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -506,7 +506,7 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) { }; const SaveLoadEntry sentenceTabEntries[] = { - MKLINE(SentenceTab, unk5, sleUint8, VER_V8), + MKLINE(SentenceTab, verb, sleUint8, VER_V8), MKLINE(SentenceTab, unk2, sleUint8, VER_V8), MKLINE(SentenceTab, unk4, sleUint16, VER_V8), MKLINE(SentenceTab, unk3, sleUint16, VER_V8), diff --git a/scumm/script.cpp b/scumm/script.cpp index 6828c7c7ac..9cbde710bc 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -794,7 +794,7 @@ void Scumm::doSentence(int c, int b, int a) { // Check if this doSentence request is identical to the previous one; // if yes, ignore this invocation. - if (_sentenceNum && st->unk5 == c && st->unk4 == b && st->unk3 == a) + if (_sentenceNum && st->verb == c && st->unk4 == b && st->unk3 == a) return; _sentenceNum++; @@ -811,7 +811,7 @@ void Scumm::doSentence(int c, int b, int a) { } - st->unk5 = c; + st->verb = c; st->unk4 = b; st->unk3 = a; st->freezeCount = 0; @@ -838,7 +838,7 @@ void Scumm::checkAndRunSentenceScript() { if (_sentence[_sentenceNum].unk2 && _sentence[_sentenceNum].unk3 == _sentence[_sentenceNum].unk4) return; - _localParamList[0] = _sentence[_sentenceNum].unk5; + _localParamList[0] = _sentence[_sentenceNum].verb; _localParamList[1] = _sentence[_sentenceNum].unk4; _localParamList[2] = _sentence[_sentenceNum].unk3; _currentScript = 0xFF; diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 7d24610b41..b15be089ac 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -816,7 +816,7 @@ void Scumm_v2::o2_doSentence() { st = &_sentence[_sentenceNum++]; - st->unk5 = a; + st->verb = a; st->unk4 = getVarOrDirectWord(0x40); st->unk3 = getVarOrDirectWord(0x20); st->freezeCount = 0; diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 859b5c73aa..f74f84563d 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -711,7 +711,7 @@ void Scumm_v5::o5_doSentence() { st = &_sentence[_sentenceNum++]; - st->unk5 = a; + st->verb = a; st->unk4 = getVarOrDirectWord(0x40); b = st->unk3 = getVarOrDirectWord(0x20); if (b == 0) { diff --git a/scumm/scumm.h b/scumm/scumm.h index 86f3ee8fc1..c0d5def7ab 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -216,7 +216,7 @@ struct ArrayHeader { }; struct SentenceTab { - byte unk5; + byte verb; byte unk2; uint16 unk4; uint16 unk3; |