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/sound_adlib.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/sound_adlib.cpp')
| -rw-r--r-- | engines/kyra/sound_adlib.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index 958cfcbcb4..1d665709e5 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -683,14 +683,14 @@ void AdLibDriver::adjustSfxData(uint8 *ptr, int volume) { _sfxVelocity = ptr[3]; // Adjust the values. - if (volume != 0xff) { + if (volume != 0xFF) { if (_version >= 3) { int newVal = ((((ptr[3]) + 63) * volume) >> 8) & 0xFF; ptr[3] = -newVal + 63; ptr[1] = ((ptr[1] * volume) >> 8) & 0xFF; } else { - int newVal = ((_sfxVelocity << 2) ^ 0xff) * volume; - ptr[3] = (newVal >> 10) ^ 0x3f; + int newVal = ((_sfxVelocity << 2) ^ 0xFF) * volume; + ptr[3] = (newVal >> 10) ^ 0x3F; ptr[1] = newVal >> 11; } } @@ -2375,7 +2375,7 @@ void SoundAdLibPC::playTrack(uint8 track) { _driver->setSyncJumpMask(0x000F); else _driver->setSyncJumpMask(0); - play(track, 0xff); + play(track, 0xFF); } } @@ -2409,7 +2409,7 @@ void SoundAdLibPC::play(uint8 track, uint8 volume) { } void SoundAdLibPC::beginFadeOut() { - play(_version > 2 ? 1 : 15, 0xff); + play(_version > 2 ? 1 : 15, 0xFF); } int SoundAdLibPC::checkTrigger() { |