aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-12-28 15:30:33 -0800
committerFilippos Karapetis2011-12-28 15:30:33 -0800
commit7e45a88b064b022e8ea7a98564c67c93615b5ccb (patch)
treea7da5ef9236ac506b10c42d56d30c2f6e0c65499
parent7f977fca7b25a0b5d3104218edc017f32d2886f6 (diff)
parenta589f3d12f72c4f59a4c4bc5216f17adf60494d5 (diff)
downloadscummvm-rg350-7e45a88b064b022e8ea7a98564c67c93615b5ccb.tar.gz
scummvm-rg350-7e45a88b064b022e8ea7a98564c67c93615b5ccb.tar.bz2
scummvm-rg350-7e45a88b064b022e8ea7a98564c67c93615b5ccb.zip
Merge pull request #158 from fingolfin/fix-warnings
SCUMM: Fix warning due to implicit conversion to int
-rw-r--r--engines/scumm/player_apple2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h
index d9345a7113..4cbd24b81d 100644
--- a/engines/scumm/player_apple2.h
+++ b/engines/scumm/player_apple2.h
@@ -170,7 +170,7 @@ public:
void setSampleRate(int rate) {
/* ~46 CPU cycles per sample @ 22.05kHz */
- _cyclesPerSampleFP = APPLEII_CPU_CLOCK * (1 << PREC_SHIFT) / rate;
+ _cyclesPerSampleFP = int(APPLEII_CPU_CLOCK * (1 << PREC_SHIFT) / rate);
reset();
}