diff options
| author | James Brown | 2002-09-30 04:36:19 +0000 |
|---|---|---|
| committer | James Brown | 2002-09-30 04:36:19 +0000 |
| commit | c28f592475747330803372faef4f99b71d7c50de (patch) | |
| tree | 4fda3a2b684ad5a37288603171d91192ebd76f0a | |
| parent | d921d06d3965d2ee5ad072503d72d52564947b21 (diff) | |
| download | scummvm-rg350-c28f592475747330803372faef4f99b71d7c50de.tar.gz scummvm-rg350-c28f592475747330803372faef4f99b71d7c50de.tar.bz2 scummvm-rg350-c28f592475747330803372faef4f99b71d7c50de.zip | |
Fix compilation for Visual Studio and GCC, as broken by Fingolfins checkins
Derive something useful from patch 616301
svn-id: r5048
| -rw-r--r-- | scumm/imuse.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 8759725391..238d214909 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -3679,7 +3679,7 @@ void IMuseAdlib::adlib_setup_channel(int chan, Instrument * instr, byte vol_1, b 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); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index c406520c09..2f73d9e2ab 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -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 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _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; |