diff options
| author | Paul Gilbert | 2012-06-19 21:19:17 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-06-19 21:19:17 +1000 |
| commit | 9d437a26dd296d6cf7e4db4749a90cafe9787377 (patch) | |
| tree | 63473336d21ed5d910b003dc7d4608e000ee768b /engines/tony | |
| parent | b8d5e17fefd2a36e253a150fee324c912ca35384 (diff) | |
| download | scummvm-rg350-9d437a26dd296d6cf7e4db4749a90cafe9787377.tar.gz scummvm-rg350-9d437a26dd296d6cf7e4db4749a90cafe9787377.tar.bz2 scummvm-rg350-9d437a26dd296d6cf7e4db4749a90cafe9787377.zip | |
TONY: Fix some compiler warnings in the newly added sound code
Diffstat (limited to 'engines/tony')
| -rw-r--r-- | engines/tony/sound.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp index 484b279cda..e4f46af146 100644 --- a/engines/tony/sound.cpp +++ b/engines/tony/sound.cpp @@ -266,7 +266,7 @@ uint32 CODECADPCMMONO::decompress(Common::SeekableReadStream *stream, void *buf, uint16 *lpBuf = (uint16 *)buf; byte *inp; int bufferstep; - int cache; + int cache = 0; int delta; int sign; int vpdiff; @@ -348,7 +348,7 @@ uint32 CODECADPCMSTEREO::decompress(Common::SeekableReadStream *stream, void *bu uint16 *lpBuf=(uint16 *)buf; byte *inp; int bufferstep; - int cache; + int cache = 0; int delta; int sign; int vpdiff; @@ -1015,7 +1015,7 @@ bool FPStream::unloadFile() { } void FPStream::prefetch() { - void *lpBuf; + void *lpBuf = NULL; if (!_bSoundSupported || !_bFileLoaded) return; @@ -1042,6 +1042,8 @@ void FPStream::prefetch() { _vm->GUIError("Cannot lock stream buffer!", "soundLoadStream()"); return; } +#else + error("lpBuf isn't set"); #endif // Uncompress the data from the stream directly into the locked buffer |