aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/saga.h
diff options
context:
space:
mode:
authorFilippos Karapetis2007-07-06 13:21:43 +0000
committerFilippos Karapetis2007-07-06 13:21:43 +0000
commit3efcdd7a4316d41fa9626ceee0f8491b463a76c7 (patch)
tree758f5ca452c5e017ce120defebb5e029cf8dc87e /engines/saga/saga.h
parentceca6a82f1f64c3a9e950628e1930f5f18aceb23 (diff)
downloadscummvm-rg350-3efcdd7a4316d41fa9626ceee0f8491b463a76c7.tar.gz
scummvm-rg350-3efcdd7a4316d41fa9626ceee0f8491b463a76c7.tar.bz2
scummvm-rg350-3efcdd7a4316d41fa9626ceee0f8491b463a76c7.zip
Modified ticksToMSec in IHNM, so that it waits for the correct amount of time. Many animations which were not displayed quite right are fixed now, including some small syncing issues with video and sound in some places
svn-id: r27939
Diffstat (limited to 'engines/saga/saga.h')
-rw-r--r--engines/saga/saga.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 19d965643a..844a738418 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -339,6 +339,7 @@ enum GameObjectTypes {
enum ScriptTimings {
kScriptTimeTicksPerSecond = (728L/10L),
+ kScriptTimeTicksPerSecondIHNM = 72,
kRepeatSpeedTicks = (728L/10L)/3,
kNormalFadeDuration = 320, // 64 steps, 5 msec each
kQuickFadeDuration = 64, // 64 steps, 1 msec each
@@ -459,10 +460,6 @@ struct SaveGameHeader {
char name[SAVE_TITLE_SIZE];
};
-inline int ticksToMSec(int tick) {
- return tick * 1000 / kScriptTimeTicksPerSecond;
-}
-
inline int clamp(int minValue, int value, int maxValue) {
if (value <= minValue) {
return minValue;
@@ -595,6 +592,13 @@ public:
return _leftMouseButtonPressed || _rightMouseButtonPressed;
}
+ inline int ticksToMSec(int tick) {
+ if (getGameType() == GType_ITE)
+ return tick * 1000 / kScriptTimeTicksPerSecond;
+ else
+ return tick * 1000 / kScriptTimeTicksPerSecondIHNM;
+ }
+
private:
uint _saveFilesMaxCount;
uint _saveFilesCount;