aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--saga/saga.h4
-rw-r--r--saga/sndres.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/saga/saga.h b/saga/saga.h
index c5d2db4287..37ea016619 100644
--- a/saga/saga.h
+++ b/saga/saga.h
@@ -33,10 +33,6 @@
#include "common/stream.h"
#include "common/rect.h"
-// TODO: These shouldn't be here!
-#include <limits.h>
-#include <stddef.h>
-
#include "saga/text.h"
#include "saga/gfx.h"
#include "saga/list.h"
diff --git a/saga/sndres.cpp b/saga/sndres.cpp
index 4262709bc0..fd4a84daab 100644
--- a/saga/sndres.cpp
+++ b/saga/sndres.cpp
@@ -270,7 +270,7 @@ int SndRes::getVoiceLength(uint32 voice_rn) {
ms_f = (double)length / 22050 * 2000.0;
ms_i = (int)ms_f;
} else if (res_type == GAME_SOUND_PCM) {
- ms_f = (double)length / (_snd_info.sample_size / CHAR_BIT) / (_snd_info.freq) * 1000.0;
+ ms_f = (double)length / (_snd_info.sample_size / 8) / (_snd_info.freq) * 1000.0;
ms_i = (int)ms_f;
} else if (res_type == GAME_SOUND_VOC) {
// Rough hack, fix this to be accurate