[Scummvm-cvs-logs] CVS: scummvm costume.cpp,1.42,1.43 script_v1.cpp,1.136,1.137 sound.cpp,1.124,1.125
James Brown
ender at users.sourceforge.net
Wed Aug 14 02:48:02 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv31202
Modified Files:
costume.cpp script_v1.cpp sound.cpp
Log Message:
Two patches by Torbjörn Andersson.
594922: Fix loom masking
594921: Loom sound fixes
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- costume.cpp 4 Aug 2002 00:04:50 -0000 1.42
+++ costume.cpp 14 Aug 2002 09:47:21 -0000 1.43
@@ -291,7 +291,7 @@
masking = 0;
if (_vm->_features & GF_SMALL_HEADER)
- masking = _zbuf;
+ masking = (_zbuf != 0);
else
masking =
_vm->isMaskActiveAt(_left, _top, _right, _bottom,
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- script_v1.cpp 13 Aug 2002 19:28:15 -0000 1.136
+++ script_v1.cpp 14 Aug 2002 09:47:21 -0000 1.137
@@ -2712,10 +2712,17 @@
delay = (int)((getVarOrDirectWord(0x40) & 0xffff) * 7.5);
if (_gameId == GID_LOOM256) {
_vars[VAR_MI1_TIMER] = 0;
+ if (offset == 0 && delay == 0) {
#ifdef COMPRESSED_SOUND_FILE
- if (playMP3CDTrack(1, 0, offset, delay) == -1)
+ if (stopMP3CD() == -1)
#endif
- _system->play_cdrom(1, 0, offset, delay);
+ _system->stop_cdrom();
+ } else {
+#ifdef COMPRESSED_SOUND_FILE
+ if (playMP3CDTrack(1, 0, offset, delay) == -1)
+#endif
+ _system->play_cdrom(1, 0, offset, delay);
+ }
} else {
warning("parseString: 8");
}
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- sound.cpp 8 Aug 2002 21:54:49 -0000 1.124
+++ sound.cpp 14 Aug 2002 09:47:21 -0000 1.125
@@ -510,7 +510,7 @@
IMuse *se;
int i;
- if (a == current_cd_sound) {
+ if (a != 0 && a == current_cd_sound) {
current_cd_sound = 0;
#ifdef COMPRESSED_SOUND_FILE
if (stopMP3CD() == -1)
More information about the Scummvm-git-logs
mailing list