thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ooops

Browse source 
svn-id: r14992
This commit is contained in:
Travis Howell 2004-09-10 10:45:22 +00:00
parent 98f8433396
commit 00452c4073
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/scumm.cpp
View file

@ -680,7 +680,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_skipProcessActors = 0; _skipProcessActors = 0;
_heSndSoundId = 0; _heSndSoundId = 0;
_heSndOffset = 0; _heSndOffset = 0;
_heSndTimer = 0; _heSndChannel = 0;
_heSndLoop = 0; _heSndLoop = 0;
_heSndSoundFreq = 0; _heSndSoundFreq = 0;
memset(_timers, 0, sizeof(_timers)); memset(_timers, 0, sizeof(_timers));
@ -1417,7 +1417,7 @@ void ScummEngine::initScummVars() {
} else if (_version >= 7) { } else if (_version >= 7) {
VAR(VAR_V6_EMSSPACE) = 10000; VAR(VAR_V6_EMSSPACE) = 10000;
VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1; VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
} else if (_heversion >= 71) { } else if (_heversion >= 70) {
VAR(VAR_NUM_SOUND_CHANNELS) = 3; VAR(VAR_NUM_SOUND_CHANNELS) = 3;
VAR(VAR_MUSIC_CHANNEL) = 1; VAR(VAR_MUSIC_CHANNEL) = 1;
VAR(VAR_SOUND_CHANNEL) = 2; VAR(VAR_SOUND_CHANNEL) = 2;

2
scumm/scumm.h
View file

@ -1052,7 +1052,7 @@ public:
byte _proc_special_palette[256]; byte _proc_special_palette[256];
byte _roomPalette[256]; byte _roomPalette[256];
byte *_shadowPalette; byte *_shadowPalette;
int _heSndSoundFreq, _heSndOffset, _heSndTimer, _heSndSoundId, _heSndLoop; int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndLoop;
bool _skipDrawObject, _skipProcessActors; bool _skipDrawObject, _skipProcessActors;
int _timers[4]; int _timers[4];