[Scummvm-git-logs] scummvm master -> a4ab2d8cfe5cb5db0f5ccb7854bbd726a5fa0eaf

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a4ab2d8cfe SAGA: Deduplicate kScriptTimeTicksPerSecond constant


Commit: a4ab2d8cfe5cb5db0f5ccb7854bbd726a5fa0eaf
    https://github.com/scummvm/scummvm/commit/a4ab2d8cfe5cb5db0f5ccb7854bbd726a5fa0eaf
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-08-03T14:58:09+02:00

Commit Message:
SAGA: Deduplicate kScriptTimeTicksPerSecond constant

Changed paths:
    engines/saga/saga.h


diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 422eaa5..db581f2 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -311,7 +311,6 @@ 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
@@ -586,10 +585,7 @@ public:
 	}
 
 	inline int ticksToMSec(int tick) const {
-		if (getGameId() == GID_ITE)
-			return tick * 1000 / kScriptTimeTicksPerSecond;
-		else
-			return tick * 1000 / kScriptTimeTicksPerSecondIHNM;
+		return tick * 1000 / kScriptTimeTicksPerSecond;
 	}
 
  private: