diff options
| author | Strangerke | 2017-01-24 22:47:05 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-25 22:42:26 +0100 |
| commit | 59212d9270265045690bf5a83dc7d87242dfa281 (patch) | |
| tree | c1f1a2ead903e1a1a704276ad49149d4ed8a2cdf | |
| parent | aeeaf9b9e6bc430f17c0fd279b666ee55f80cece (diff) | |
| download | scummvm-rg350-59212d9270265045690bf5a83dc7d87242dfa281.tar.gz scummvm-rg350-59212d9270265045690bf5a83dc7d87242dfa281.tar.bz2 scummvm-rg350-59212d9270265045690bf5a83dc7d87242dfa281.zip | |
CRYO: Fix some warnings
| -rw-r--r-- | engines/cryo/eden.cpp | 4 | ||||
| -rw-r--r-- | engines/cryo/eden.h | 2 | ||||
| -rw-r--r-- | engines/cryo/sound.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 06cd9022cf..baf0dcd473 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -55,7 +55,7 @@ int16 _torchCurIndex = 0; bool _allowDoubled = true; int _cursCenter = 11; -EdenGame::EdenGame(CryoEngine *vm) : _vm(vm) { +EdenGame::EdenGame(CryoEngine *vm) : _vm(vm), kMaxMusicSize(2200000) { static uint8 statTab2CB1E[8][4] = { { 0x10, 0x81, 1, 0x90}, { 0x90, 1, 0x81, 0x10}, @@ -6713,7 +6713,7 @@ int EdenGame::loadmusicfile(int16 num) { int32 size = file->_size; int32 offs = file->_offs; _bigfile.seek(offs, SEEK_SET); - int32 numread = size; + uint32 numread = size; if (numread > kMaxMusicSize) error("Music file %s is too big", file->_name); _bigfile.read(_musicBuf, numread); diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h index edcfc860a7..651b9cd880 100644 --- a/engines/cryo/eden.h +++ b/engines/cryo/eden.h @@ -736,7 +736,7 @@ private: uint8 tab_2CB1E[8][4]; - const unsigned int kMaxMusicSize = 2200000; // largest .mus file size + const unsigned int kMaxMusicSize; // largest .mus file size }; } diff --git a/engines/cryo/sound.cpp b/engines/cryo/sound.cpp index 1176ccec90..f4eec8cabb 100644 --- a/engines/cryo/sound.cpp +++ b/engines/cryo/sound.cpp @@ -41,7 +41,7 @@ CSoundChannel::~CSoundChannel() { delete _audioStream;
}
-void CSoundChannel::queueBuffer(byte *buffer, unsigned int size, bool playNow, bool playQueue, bool buffering = true) {
+void CSoundChannel::queueBuffer(byte *buffer, unsigned int size, bool playNow, bool playQueue, bool buffering) {
if (playNow)
stop();
|