[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.16,1.17 scummvm.cpp,1.44,1.45

[James Brown]

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

Modified Files:
	imuse.cpp scummvm.cpp 
Log Message:
Fix compilation for Visual Studio and GCC, as broken by Fingolfins checkins
Derive something useful from patch 616301


Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- imuse.cpp	29 Sep 2002 15:14:54 -0000	1.16
+++ imuse.cpp	30 Sep 2002 04:36:19 -0000	1.17
@@ -3679,7 +3679,7 @@
 	port = channel_mappings[chan];
 	adlib_write(port + 0x20, instr->flags_1);
 
-	if ((g_scumm->_gameId != GID_MONKEY_VGA) || (instr->feedback & 1))
+        if (!(g_scumm->_features & GF_SMALL_HEADER) || (instr->feedback & 1))
 		adlib_write(port + 0x40, (instr->oplvl_1 | 0x3F) - vol_1 );
 	else
 		adlib_write(port + 0x40, instr->oplvl_1);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- scummvm.cpp	30 Sep 2002 00:55:47 -0000	1.44
+++ scummvm.cpp	30 Sep 2002 04:36:19 -0000	1.45
@@ -1,6 +1,6 @@
 /* ScummVM - Scumm Interpreter
  * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001/2002 The ScummVM project
+ * wCopyright (C) 2001/2002 The ScummVM project
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -81,7 +81,7 @@
 
 	_debugMode = detector->_debugMode;
 	_bootParam = detector->_bootParam;
-	_exe_name = detector->_gameFileName.c_str();
+	_exe_name = (char*)detector->_gameFileName.c_str();
 	_gameId = detector->_gameId;
 	_gameText = detector->_gameText;
 	_features = detector->_features;