[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.57,1.58

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv14947

Modified Files:
	imuse.cpp 
Log Message:
Fix oversight - GID_'s are stored as a constant assigned to Scumm::_gameId, NOT as a bit of Scumm::_features :)


Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- imuse.cpp	13 Oct 2002 08:15:15 -0000	1.57
+++ imuse.cpp	13 Oct 2002 14:21:57 -0000	1.58
@@ -1462,7 +1462,7 @@
 		case 16:
 			return set_volchan(b, c);
 		case 17:
-			if (g_scumm->_features & GID_SAMNMAX) {
+			if (g_scumm->_gameId == GID_SAMNMAX) {
 				// Sam & Max: ImSetTrigger.
 				// Sets a trigger for a particular player and
 				// marker ID, along with do_command parameters
@@ -1510,12 +1510,12 @@
 
 		switch (cmd) {
 		case 0:
-			if (g_scumm->_features & GID_SAMNMAX)
+			if (g_scumm->_gameId == GID_SAMNMAX)
 				return player->_def_do_command_trigger;
 			else
 				return player->get_param(c, d);
 		case 1:
-			if (g_scumm->_features & GID_SAMNMAX) // Jamieson630: Nasty
+			if (g_scumm->_gameId == GID_SAMNMAX) // Jamieson630: Nasty
 				player->jump (d - 1, (e - 1) * 4 + f, ((g * player->_ticks_per_beat) >> 2) + h);
 			else
 				player->set_priority(c);
@@ -3270,7 +3270,7 @@
 	_transpose = 0;
 	_detune = 0;
 	_detune_eff = player->_detune;
-	_pitchbend_factor = ((g_scumm->_features & GID_SAMNMAX) ? 2 : 12);
+	_pitchbend_factor = ((g_scumm->_gameId == GID_SAMNMAX) ? 2 : 12);
 	_pitchbend = 0;
 	_effect_level = 64;
 	_program = 255;