aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-06 12:14:02 -0400
committerPaul Gilbert2016-08-06 12:14:02 -0400
commitf0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4 (patch)
tree078f3b879d844b955b030d27b03918620c907421 /engines/titanic/pet_control
parent139ad46410fe0a92a83eabd662caf2165eb498da (diff)
downloadscummvm-rg350-f0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4.tar.gz
scummvm-rg350-f0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4.tar.bz2
scummvm-rg350-f0d208cdcf6e8fb8fc60ae3eddc62fc255fae2e4.zip
TITANIC: Added more sound manager methods
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r--engines/titanic/pet_control/pet_conversations.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index 9bae8e7070..dc096afcfe 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -541,14 +541,10 @@ void CPetConversations::npcDialChange(uint dialNum, int oldLevel, int newLevel)
}
int64 val1 = (oldLevel * dest) + (100 - oldLevel) * src;
- val1 *= 0x51EB851F;
- val1 >>= 37;
- uint startFrame = val1 + (val1 >> 31);
+ uint startFrame = val1 / 100;
int64 val2 = (newLevel * dest) + (100 - newLevel) * src;
- val2 *= 0x51EB851F;
- val2 >>= 37;
- uint endFrame = val2 + (val2 >> 31);
+ uint endFrame = val2 / 100;
if (startFrame != endFrame)
_dials[dialNum].playMovie(startFrame, endFrame);