SCUMM: Change _defaultTalkDelay to _defaultTextSpeed

From now on we're reasoning in terms of text speed, just like the interpreter does,
which means: delay == 9 - speed.
This allows us to sync the internal GUI and the ScummVM GUI more easily, and
allows for a better correspondence to the original interpreters.
This commit is contained in:
AndywinXp 2022-08-13 02:37:46 +02:00 committed by athrxx
parent 457bcb67db
commit 2417448791
6 changed files with 31 additions and 32 deletions

View file

@ -789,7 +789,7 @@ bool ScummEngine::loadState(int slot, bool compat, Common::String &filename) {
if (_game.version == 8)
_scummVars[VAR_CHARINC] = (_game.features & GF_DEMO) ? 3 : 1;
// Needed due to subtitle speed changes
_defaultTalkDelay /= 20;
_defaultTextSpeed /= 20;
}
// For a long time, we used incorrect locations for some camera related
@ -1325,7 +1325,7 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
s.syncAsByte(_useTalkAnims, VER(8));
s.syncAsSint16LE(_talkDelay, VER(8));
s.syncAsSint16LE(_defaultTalkDelay, VER(8));
s.syncAsSint16LE(_defaultTextSpeed, VER(8));
s.skip(2, VER(8), VER(27)); // _numInMsgStack
s.syncAsByte(_sentenceNum, VER(8));