diff options
| author | Filippos Karapetis | 2011-12-28 15:30:33 -0800 |
|---|---|---|
| committer | Filippos Karapetis | 2011-12-28 15:30:33 -0800 |
| commit | 7e45a88b064b022e8ea7a98564c67c93615b5ccb (patch) | |
| tree | a7da5ef9236ac506b10c42d56d30c2f6e0c65499 /engines | |
| parent | 7f977fca7b25a0b5d3104218edc017f32d2886f6 (diff) | |
| parent | a589f3d12f72c4f59a4c4bc5216f17adf60494d5 (diff) | |
| download | scummvm-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
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/player_apple2.h | 2 |
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(); } |