libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regressions in earliest HE games again.

Browse Source 
Remove pointless scumm var reset to zero.

svn-id: r19956
This commit is contained in:
Travis Howell 2006-01-09 11:01:35 +00:00
parent a163b2ae2b
commit b99859f227
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/intern.h
View File

@ -793,8 +793,6 @@ protected:
virtual void executeOpcode(byte i);
virtual const char *getOpcodeDesc(byte i);
virtual void initScummVars();
virtual void saveOrLoad(Serializer *s);
void localizeArray(int slot, byte scriptSlot);

2
scumm/script_v6.cpp
View File

@ -1087,7 +1087,7 @@ void ScummEngine_v6::o6_startSound() {
// In Fatty Bear's Birthday Surprise the piano uses offsets 1 - 23 to
// indicate which note to play, but only when using the standard piano
// sound. See also o60_soundOps()
if (_heversion >= 61 && (_gameId != GID_PUTTDEMO))
if (_heversion >= 60 && (_gameId != GID_PUTTDEMO))
offset = pop();
#ifndef DISABLE_SCUMM_7_8

28
scumm/vars.cpp
View File

@ -86,7 +86,7 @@ void ScummEngine::setupScummVars() {
VAR_USERPUT = 53;
}
if (_gameId == GID_LOOM256 || _version >= 5) {
if (_version >= 5) {
VAR_SOUNDPARAM = 64;
VAR_SOUNDPARAM2 = 65;
VAR_SOUNDPARAM3 = 66;
@ -571,15 +571,6 @@ void ScummEngine_v7::initScummVars() {
}
#endif
void ScummEngine_v60he::initScummVars() {
ScummEngine::initScummVars();
VAR(VAR_MACHINE_SPEED) = 2;
VAR(VAR_SOUNDPARAM) = 1; // Soundblaster for music
VAR(VAR_SOUNDPARAM2) = 1; // Soundblaster for sound effects
}
#ifndef DISABLE_HE
void ScummEngine_v70he::initScummVars() {
ScummEngine::initScummVars();
@ -671,11 +662,6 @@ void ScummEngine::initScummVars() {
VAR(VAR_SOUNDCARD) = 3;
}
}
if (_gameId == GID_LOOM256 || _version >= 5) {
VAR(VAR_SOUNDPARAM) = 0;
VAR(VAR_SOUNDPARAM2) = 0;
VAR(VAR_SOUNDPARAM3) = 0;
}
if (_platform == Common::kPlatformFMTowns)
VAR(VAR_VIDEOMODE) = 42;
@ -692,10 +678,8 @@ void ScummEngine::initScummVars() {
else
VAR(VAR_VIDEOMODE) = 19;
VAR(VAR_CURRENTDRIVE) = 0;
if (_platform == Common::kPlatformMacintosh && (_features & GF_OLD_BUNDLE)) {
// This is the for the Mac version of Indy3/Loom
// Set screen size for the Macintosh version of Indy3/Loom
VAR(39) = 320;
}
if (_platform == Common::kPlatformPC && _gameId == GID_LOOM) {
@ -711,6 +695,14 @@ void ScummEngine::initScummVars() {
VAR(VAR_MOUSEPRESENT) = 1;
if (_version == 6)
VAR(VAR_V6_EMSSPACE) = 10000;
if (_heversion >= 60) {
// Set fast speed, to enable all animations
VAR(VAR_MACHINE_SPEED) = 2;
VAR(VAR_SOUNDPARAM) = 1; // Soundblaster for music
VAR(VAR_SOUNDPARAM2) = 1; // Soundblaster for sound effects
}
}
if (VAR_ROOM_WIDTH != 0xFF && VAR_ROOM_HEIGHT != 0xFF) {