[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.544,2.545 script_v6.cpp,1.456,1.457 vars.cpp,1.157,1.158
kirben
kirben at users.sourceforge.net
Mon Jan 9 03:02:00 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/kyra staticres.cpp,1.35,1.36
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.18,1.19 game.cpp,1.33,1.34 goblin.cpp,1.29,1.30 inter.cpp,1.31,1.32 inter_v1.cpp,1.4,1.5 map.cpp,1.20,1.21 mult.cpp,1.16,1.17 mult.h,1.7,1.8 scenery.cpp,1.23,1.24 scenery.h,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26197/scumm
Modified Files:
intern.h script_v6.cpp vars.cpp
Log Message:
Fix regressions in earliest HE games again.
Remove pointless scumm var reset to zero.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.544
retrieving revision 2.545
diff -u -d -r2.544 -r2.545
--- intern.h 6 Jan 2006 23:54:42 -0000 2.544
+++ intern.h 9 Jan 2006 11:01:35 -0000 2.545
@@ -793,8 +793,6 @@
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);
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -d -r1.456 -r1.457
--- script_v6.cpp 21 Oct 2005 23:31:23 -0000 1.456
+++ script_v6.cpp 9 Jan 2006 11:01:35 -0000 1.457
@@ -1087,7 +1087,7 @@
// 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
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- vars.cpp 5 Jan 2006 07:06:47 -0000 1.157
+++ vars.cpp 9 Jan 2006 11:01:35 -0000 1.158
@@ -86,7 +86,7 @@
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 @@
}
#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 @@
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 @@
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 @@
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) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/kyra staticres.cpp,1.35,1.36
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.18,1.19 game.cpp,1.33,1.34 goblin.cpp,1.29,1.30 inter.cpp,1.31,1.32 inter_v1.cpp,1.4,1.5 map.cpp,1.20,1.21 mult.cpp,1.16,1.17 mult.h,1.7,1.8 scenery.cpp,1.23,1.24 scenery.h,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list