diff options
| author | Travis Howell | 2005-05-01 06:54:27 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-01 06:54:27 +0000 |
| commit | c76f228f67bfd8833459e8abdcf16d26daf851f3 (patch) | |
| tree | 01bc9df9aa4753460589f6c9168f5e795f3e61c1 | |
| parent | cb6c2b9da5b49a8ef8617766d6e4421d8e8c0150 (diff) | |
| download | scummvm-rg350-c76f228f67bfd8833459e8abdcf16d26daf851f3.tar.gz scummvm-rg350-c76f228f67bfd8833459e8abdcf16d26daf851f3.tar.bz2 scummvm-rg350-c76f228f67bfd8833459e8abdcf16d26daf851f3.zip | |
VAR_NUM_SOUND_CHANNELS is 88 in HE80+ games.
svn-id: r17880
| -rw-r--r-- | scumm/intern.h | 2 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 2 | ||||
| -rw-r--r-- | scumm/vars.cpp | 9 |
4 files changed, 6 insertions, 9 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index b7a634c136..676d2a256a 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -939,8 +939,6 @@ protected: void o72_setFilePath(); void o72_setWindowCaption(); - byte VAR_NUM_ACTIVE_SOUND_CHANNELS; - byte VAR_NUM_ROOMS; byte VAR_NUM_SCRIPTS; byte VAR_NUM_SOUNDS; diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 8feec7fac1..506dc46890 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -2136,6 +2136,8 @@ void ScummEngine_v72he::o72_readINI() { default: error("o72_readINI: default type %d", type); } + + debug(0, "o72_readINI: Option %s", option); } void ScummEngine_v72he::o72_writeINI() { diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index b0e504d062..fffe88e969 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1280,8 +1280,6 @@ ScummEngine_v70he::~ScummEngine_v70he() { ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v71he(detector, syst, gs, md5sum) { - VAR_NUM_ACTIVE_SOUND_CHANNELS = 0xFF; - VAR_NUM_ROOMS = 0xFF; VAR_NUM_SCRIPTS = 0xFF; VAR_NUM_SOUNDS = 0xFF; diff --git a/scumm/vars.cpp b/scumm/vars.cpp index 9b7c3f2697..c6a1c6fe43 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -194,7 +194,6 @@ void ScummEngine_v70he::setupScummVars() { } void ScummEngine_v72he::setupScummVars() { - // TODO Not complete VAR_KEYPRESS = 0; VAR_DEBUGMODE = 1; VAR_TIMER_NEXT = 2; @@ -245,7 +244,6 @@ void ScummEngine_v72he::setupScummVars() { VAR_SOUND_CHANNEL = 51; VAR_MUSIC_CHANNEL = 52; - VAR_NUM_SOUND_CHANNELS = 56; VAR_MEMORY_PERFORMANCE = 57; VAR_VIDEO_PERFORMANCE = 58; VAR_NEW_ROOM = 59; @@ -268,10 +266,13 @@ void ScummEngine_v72he::setupScummVars() { VAR_MOUSE_STATE = 75; VAR_POLYGONS_ONLY = 76; + if (_heversion == 72) { + VAR_NUM_SOUND_CHANNELS = 56; + } if (_heversion >= 80) VAR_WINDOWS_VERSION = 79; VAR_KEY_STATE = 86; - VAR_NUM_ACTIVE_SOUND_CHANNELS = 88; + VAR_NUM_SOUND_CHANNELS = 88; if (_heversion >= 90) { VAR_SCRIPT_CYCLE = 103; VAR_NUM_SCRIPT_CYCLES = 104; @@ -552,8 +553,6 @@ void ScummEngine_v80he::initScummVars() { VAR(78) = 1; VAR(VAR_WINDOWS_VERSION) = 40; - - VAR(VAR_NUM_ACTIVE_SOUND_CHANNELS) = (_heversion >= 90) ? 8 : 4; } void ScummEngine_v90he::initScummVars() { |