[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2a.cpp,2.25,2.26

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26801

Modified Files:
	player_v2a.cpp 
Log Message:
Portability fixes.


Index: player_v2a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.cpp,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -d -r2.25 -r2.26
--- player_v2a.cpp	9 Feb 2005 00:39:20 -0000	2.25
+++ player_v2a.cpp	9 Feb 2005 03:26:08 -0000	2.26
@@ -1038,10 +1038,10 @@
 		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 @@
 		_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: