diff options
| author | Johannes Schickel | 2013-01-09 06:00:35 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2013-01-09 06:01:28 +0100 |
| commit | 8d5b4b75d406bb56130fb4ccd91edda4ba1f4906 (patch) | |
| tree | f6f481c09553c1f454c31bbb88490de26e326069 /engines/kyra/vqa.cpp | |
| parent | ff296175bc558ce5758a0948ab91333a6d3b918e (diff) | |
| download | scummvm-rg350-8d5b4b75d406bb56130fb4ccd91edda4ba1f4906.tar.gz scummvm-rg350-8d5b4b75d406bb56130fb4ccd91edda4ba1f4906.tar.bz2 scummvm-rg350-8d5b4b75d406bb56130fb4ccd91edda4ba1f4906.zip | |
KYRA: Make all hex constants use uppercase letters.
Done with:
git ls-files "*.cpp" *".h" | xargs sed -i -e 's/0x\([0-9a-f]*\)/0x\U\1/g'
Diffstat (limited to 'engines/kyra/vqa.cpp')
| -rw-r--r-- | engines/kyra/vqa.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 471e83c9ed..081d94a050 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -126,8 +126,8 @@ void VQAMovie::decodeSND1(byte *inbuf, uint32 insize, byte *outbuf, uint32 outsi while (outsize > 0) { input = *inbuf++ << 2; - code = (input >> 8) & 0xff; - count = (input & 0xff) >> 2; + code = (input >> 8) & 0xFF; + count = (input & 0xFF) >> 2; switch (code) { case 2: @@ -149,7 +149,7 @@ void VQAMovie::decodeSND1(byte *inbuf, uint32 insize, byte *outbuf, uint32 outsi for (; count >= 0; count--) { code = *inbuf++; - curSample += WSTable4Bit[code & 0x0f]; + curSample += WSTable4Bit[code & 0x0F]; curSample = CLIP<int16>(curSample, 0, 255); *outbuf++ = curSample; @@ -264,7 +264,7 @@ bool VQAMovie::open(const char *filename) { _frameInfo = new uint32[_header.numFrames]; _frame = new byte[_header.width * _header.height]; - _codeBookSize = 0xf00 * _header.blockW * _header.blockH; + _codeBookSize = 0xF00 * _header.blockW * _header.blockH; _codeBook = new byte[_codeBookSize]; _partialCodeBook = new byte[_codeBookSize]; memset(_codeBook, 0, _codeBookSize); |