thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Adjust timings for Italian Sam & Max Floppy intro.

Browse source 
This version uses English speech, and doesn't need the workaround for
the fight animation speeds. But several lines still had to be re-timed.
This commit is contained in:
Torbjörn Andersson 2022-04-03 12:27:39 +02:00 • committed by Torbjörn Andersson
parent 5280abc4d7
commit 6d8eba977d
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/scumm/script.cpp
View file

@ -664,7 +664,9 @@ void ScummEngine::writeVar(uint var, int value) {
// Max beats up the scientist. This was probably to
// match the subtitles to the speech better, but this
// is just too much!
// is just too much! The floppy version doesn't do this
// but there's no need to explicitly test this since
// the script never sets the value to 2 there.
if (value == 2 && _language == Common::IT_ITA)
value = 3;
}

30
engines/scumm/string.cpp
View file

@ -77,9 +77,9 @@ void ScummEngine::printString(int m, const byte *msg) {
// for the animation to match. We get around this by slowing
// down that animation.
//
// In the italian version, the whole scene is sped up to keep up
// with Sam's speech. We compensate for this by slowing down the
// other animations.
// In the italian CD version, the whole scene is sped up to
// keep up with Sam's speech. We compensate for this by slowing
// down the other animations.
if (_game.id == GID_SAMNMAX && vm.slot[_currentScript].number == 65 && _enableEnhancements) {
Actor *a;
@ -89,7 +89,7 @@ void ScummEngine::printString(int m, const byte *msg) {
if (a)
a->setAnimSpeed(3);
}
} else if (_language == Common::IT_ITA) {
} else if (_language == Common::IT_ITA && strcmp(_game.variant, "Floppy") != 0) {
if (memcmp(msg + 16, "Ooh.", 4) == 0) {
a = derefActorSafe(3, "printString");
if (a)
@ -255,7 +255,18 @@ bool ScummEngine::handleNextCharsetCode(Actor *a, int *code) {
{ "Kann ich fahren?", 240, 0 }
};
TimingAdjustment timingAdjustmentsIT[] = {
TimingAdjustment timingAdjustmentsITFloppy[] = {
{ "E per questo^", 140, 0 },
{ "E' che^ecco^", 100, 0 },
{ "^imprevedibile.", 170, 0 },
{ "Huh?", 110, 0 },
{ "Perch\x82 pensi", 90, 0 },
{ "Andiamocene da", 230, 0 },
{ "Forse possiamo", 75, 0 },
{ "Ti dispiace", 160, 0 }
};
TimingAdjustment timingAdjustmentsITCD[] = {
{ "E per questo^", 120, 0 },
{ "Forse sei", 75, 0 },
{ "^imprevedibile.", 170, 0 },
@ -317,8 +328,13 @@ bool ScummEngine::handleNextCharsetCode(Actor *a, int *code) {
}
break;
case Common::IT_ITA:
adjustments = timingAdjustmentsIT;
numAdjustments = ARRAYSIZE(timingAdjustmentsIT);
if (strcmp(_game.variant, "Floppy") == 0) {
adjustments = timingAdjustmentsITFloppy;
numAdjustments = ARRAYSIZE(timingAdjustmentsITFloppy);
} else {
adjustments = timingAdjustmentsITCD;
numAdjustments = ARRAYSIZE(timingAdjustmentsITCD);
}
break;
case Common::FR_FRA:
if (strcmp(_game.variant, "Floppy") == 0) {