diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/agos.cpp | 9 | ||||
| -rw-r--r-- | engines/agos/vga.cpp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 1ddc39002f..92eb3e8a1a 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -549,6 +549,7 @@ void AGOSEngine::setupGame() { _vgaMemSize = gVars->memory[kMemSimon2Games]; #endif _tableMemSize = 200000; + _frameRate = 1; _vgaBaseDelay = 5; _numVars = 2048; } else if (getGameType() == GType_FF) { @@ -561,6 +562,7 @@ void AGOSEngine::setupGame() { _vgaMemSize = gVars->memory[kMemSimon2Games]; #endif _tableMemSize = 200000; + _frameRate = 1; _vgaBaseDelay = 5; _numVars = 255; } else if (getGameType() == GType_SIMON2) { @@ -581,6 +583,7 @@ void AGOSEngine::setupGame() { else _musicIndexBase = 1128 / 4; _soundIndexBase = 1660 / 4; + _frameRate = 1; _vgaBaseDelay = 1; _numVars = 255; } else if (getGameType() == GType_SIMON1) { @@ -597,6 +600,7 @@ void AGOSEngine::setupGame() { _tableMemSize = 150000; _musicIndexBase = 1316 / 4; _soundIndexBase = 0; + _frameRate = 1; _vgaBaseDelay = 1; _numVars = 255; } else if (getGameType() == GType_WW) { @@ -609,6 +613,7 @@ void AGOSEngine::setupGame() { _vgaMemSize = gVars->memory[kMemSimon1Games]; #endif _tableMemSize = 150000; + _frameRate = 4; _vgaBaseDelay = 1; _numVars = 255; } else if (getGameType() == GType_ELVIRA2) { @@ -621,6 +626,7 @@ void AGOSEngine::setupGame() { _vgaMemSize = gVars->memory[kMemSimon1Games]; #endif _tableMemSize = 50000; + _frameRate = 4; _vgaBaseDelay = 1; _numVars = 255; } else if (getGameType() == GType_ELVIRA) { @@ -633,6 +639,7 @@ void AGOSEngine::setupGame() { _vgaMemSize = gVars->memory[kMemSimon1Games]; #endif _tableMemSize = 150000; + _frameRate = 4; _vgaBaseDelay = 1; _numVars = 512; } @@ -653,8 +660,6 @@ void AGOSEngine::setupGame() { _currentMouseCursor = 255; _currentMouseAnim = 255; - _frameRate = 1; - _lastMusicPlayed = -1; _nextMusicToPlay = -1; diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index c313d76171..bc50d86758 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -1629,7 +1629,7 @@ void AGOSEngine::vc12_delay() { } else if (getGameType() == GType_SIMON2) { num = vcReadNextByte() * _frameRate; } else { - num = vcReadVarOrWord(); + num = vcReadVarOrWord() * _frameRate; } // Work around to allow inventory arrows to be |