diff options
| author | Eugene Sandulenko | 2005-02-09 03:26:08 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-02-09 03:26:08 +0000 |
| commit | 0da123d601a4803f90032ee429914622e4dcefe0 (patch) | |
| tree | d09483eb503e6d3cc146550eec8b70bcb94ae70e /scumm/player_v2a.cpp | |
| parent | e7c6ea42aed7b2749638513803b8988c1d1cace4 (diff) | |
| download | scummvm-rg350-0da123d601a4803f90032ee429914622e4dcefe0.tar.gz scummvm-rg350-0da123d601a4803f90032ee429914622e4dcefe0.tar.bz2 scummvm-rg350-0da123d601a4803f90032ee429914622e4dcefe0.zip | |
Portability fixes.
svn-id: r16761
Diffstat (limited to 'scumm/player_v2a.cpp')
| -rw-r--r-- | scumm/player_v2a.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scumm/player_v2a.cpp b/scumm/player_v2a.cpp index 301d869a6b..307c571b78 100644 --- a/scumm/player_v2a.cpp +++ b/scumm/player_v2a.cpp @@ -1038,10 +1038,10 @@ public: memcpy(tmp_data2, data + _offset, _size); memcpy(tmp_data3, data + _offset, _size); memcpy(tmp_data4, data + _offset, _size); - _mod->startChannel(_id | 0x000, tmp_data1, _size, BASE_FREQUENCY / _freq1, min((_vol >> 1) + 3,0x32), 0, _size, -127); - _mod->startChannel(_id | 0x100, tmp_data2, _size, BASE_FREQUENCY / _freq2, min((_vol >> 1) + 3,0x32), 0, _size, 127); - _mod->startChannel(_id | 0x200, tmp_data3, _size, BASE_FREQUENCY / _freq3, min((_vol >> 1) + 3,0x32), 0, _size, 127); - _mod->startChannel(_id | 0x300, tmp_data4, _size, BASE_FREQUENCY / _freq4, min((_vol >> 1) + 3,0x32), 0, _size, -127); + _mod->startChannel(_id | 0x000, tmp_data1, _size, BASE_FREQUENCY / _freq1, MIN((_vol >> 1) + 3,0x32), 0, _size, -127); + _mod->startChannel(_id | 0x100, tmp_data2, _size, BASE_FREQUENCY / _freq2, MIN((_vol >> 1) + 3,0x32), 0, _size, 127); + _mod->startChannel(_id | 0x200, tmp_data3, _size, BASE_FREQUENCY / _freq3, MIN((_vol >> 1) + 3,0x32), 0, _size, 127); + _mod->startChannel(_id | 0x300, tmp_data4, _size, BASE_FREQUENCY / _freq4, MIN((_vol >> 1) + 3,0x32), 0, _size, -127); } virtual bool update() { assert(_id); @@ -1056,10 +1056,10 @@ public: _vol--; if (_vol == 0) return false; - _mod->setChannelVol(_id | 0x000, min((_vol >> 1) + 3,0x32)); - _mod->setChannelVol(_id | 0x100, min((_vol >> 1) + 3,0x32)); - _mod->setChannelVol(_id | 0x200, min((_vol >> 1) + 3,0x32)); - _mod->setChannelVol(_id | 0x300, min((_vol >> 1) + 3,0x32)); + _mod->setChannelVol(_id | 0x000, MIN((_vol >> 1) + 3,0x32)); + _mod->setChannelVol(_id | 0x100, MIN((_vol >> 1) + 3,0x32)); + _mod->setChannelVol(_id | 0x200, MIN((_vol >> 1) + 3,0x32)); + _mod->setChannelVol(_id | 0x300, MIN((_vol >> 1) + 3,0x32)); return true; } private: |