diff options
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index a8adf73a49..a8a9fbfe30 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -428,7 +428,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) _actorClipOverride.right = 640; _skipDrawObject = 0; - memset(_heTimers, 0, sizeof(_heTimers)); memset(_akosQueue, 0, sizeof(_akosQueue)); _akosQueuePos = 0; @@ -798,6 +797,11 @@ ScummEngine_v6::ScummEngine_v6(OSystem *syst, const DetectorResult &dr) VAR_TIMEDATE_SECOND = 0xFF; } +ScummEngine_v60he::ScummEngine_v60he(OSystem *syst, const DetectorResult &dr) + : ScummEngine_v6(syst, dr) { + memset(_heTimers, 0, sizeof(_heTimers)); +} + #ifndef DISABLE_HE ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const DetectorResult &dr) : ScummEngine_v60he(syst, dr) { @@ -1894,13 +1898,13 @@ load_game: #pragma mark --- SCUMM --- #pragma mark - -int ScummEngine::getHETimer(int timer) { +int ScummEngine_v60he::getHETimer(int timer) { checkRange(15, 1, timer, "getHETimer: Timer out of range(%d)"); int time = _system->getMillis() - _heTimers[timer]; return time; } -void ScummEngine::setHETimer(int timer) { +void ScummEngine_v60he::setHETimer(int timer) { checkRange(15, 1, timer, "setHETimer: Timer out of range(%d)"); _heTimers[timer] = _system->getMillis(); } |