Dropped sLastTrackLengthMS

captainurist · Nov 9, 2023 · d199fcc · d199fcc
1 parent 7e2ce5c
commit d199fcc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Engine/Objects/Character.cpp b/src/Engine/Objects/Character.cpp
@@ -7324,7 +7324,9 @@ void Character::playReaction(CharacterSpeech speech, int a3) {
         int expressionDuration = 0;
         if (expression == CHARACTER_EXPRESSION_TALK && pickedSoundID) {
             if (pickedSoundID >= 0) {
-                expressionDuration = (sLastTrackLengthMS << 7) / 1000;
+                // TODO(captainurist): #sound sLastTrackLengthMS wasn't set, so was dropped. Implement properly, right now
+                //                     this doesn't work.
+                expressionDuration = 1000; // Was (sLastTrackLengthMS << 7) / 1000;
             }
         }
         playEmotion(expression, expressionDuration);

diff --git a/src/Media/Audio/AudioPlayer.cpp b/src/Media/Audio/AudioPlayer.cpp
@@ -30,7 +30,6 @@
 
 #include "SoundInfo.h"
 
-int sLastTrackLengthMS;
 std::unique_ptr<AudioPlayer> pAudioPlayer;
 SoundList *pSoundList;
 

diff --git a/src/Media/Audio/AudioPlayer.h b/src/Media/Audio/AudioPlayer.h
@@ -190,7 +190,6 @@ class SoundList {
     void FromFile(const Blob &data_mm6, const Blob &data_mm7, const Blob &data_mm8);
 };
 
-extern int sLastTrackLengthMS;
 extern std::unique_ptr<AudioPlayer> pAudioPlayer;
 extern SoundList *pSoundList;