aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Haisch2008-05-12 16:10:13 +0000
committerBenjamin Haisch2008-05-12 16:10:13 +0000
commitc3b1b9bf826c485c5bc00d3e12becfed385686bf (patch)
treec3c2d8638b9fbca81df5cf932a613fdfdcd96684
parent289f96d37c8a904a79229b9554961a3c5ae22bbc (diff)
downloadscummvm-rg350-c3b1b9bf826c485c5bc00d3e12becfed385686bf.tar.gz
scummvm-rg350-c3b1b9bf826c485c5bc00d3e12becfed385686bf.tar.bz2
scummvm-rg350-c3b1b9bf826c485c5bc00d3e12becfed385686bf.zip
Fixed timer resolution/conversion; now the vulture in the first scene of RtZ lands on the sign, and the thunder sound is in sync with the flash screen effect in the Infocom logo screen.
svn-id: r32063
-rw-r--r--engines/made/made.cpp4
-rw-r--r--engines/made/made.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index ccb4ad5e8d..4ec857547b 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -135,14 +135,14 @@ int MadeEngine::init() {
int16 MadeEngine::getTimer(int16 timerNum) {
if (timerNum > 0 && timerNum <= ARRAYSIZE(_timers) && _timers[timerNum - 1] != -1)
- return (_system->getMillis() - _timers[timerNum - 1]) / 60;
+ return (_system->getMillis() - _timers[timerNum - 1]) / kTimerResolution;
else
return 32000;
}
void MadeEngine::setTimer(int16 timerNum, int16 value) {
if (timerNum > 0 && timerNum <= ARRAYSIZE(_timers))
- _timers[timerNum - 1] = value * 60;
+ _timers[timerNum - 1] = value * kTimerResolution;
}
void MadeEngine::resetTimer(int16 timerNum) {
diff --git a/engines/made/made.h b/engines/made/made.h
index f6f7fefd83..5491e8132f 100644
--- a/engines/made/made.h
+++ b/engines/made/made.h
@@ -60,6 +60,8 @@ enum MadeGameFeatures {
GF_FLOPPY = 1 << 3
};
+const uint32 kTimerResolution = 40;
+
struct MadeGameDescription;
class ProjectReader;