[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.7,1.8
Michael Pearce
chuzwuzza at users.sourceforge.net
Sun Sep 8 21:55:03 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui ListWidget.cpp,1.3,1.4 ListWidget.h,1.2,1.3 ScrollBarWidget.cpp,1.1.1.1,1.2 dialog.cpp,1.8,1.9 dialog.h,1.2,1.3 widget.cpp,1.2,1.3 widget.h,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm Makefile,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv31583/scumm
Modified Files:
script_v1.cpp
Log Message:
Applied eriktorbjorn's 'largo' monkey2 sfx fix
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- script_v1.cpp 1 Sep 2002 15:01:39 -0000 1.7
+++ script_v1.cpp 9 Sep 2002 04:54:54 -0000 1.8
@@ -1455,8 +1455,21 @@
void Scumm::o5_isEqual()
{
- int16 a = readVar(fetchScriptWord());
- int16 b = getVarOrDirectWord(0x80);
+ int16 a, b;
+ int var;
+
+ var = fetchScriptWord();
+ a = readVar(var);
+ b = getVarOrDirectWord(0x80);
+
+ // HACK: See bug report #602348. The sound effects for Largo's screams
+ // are only played on type 5 soundcards. However, there is at least one
+ // other sound effect (the bartender spitting) which is only played on
+ // type 3 soundcards.
+
+ if (_gameId == GID_MONKEY2 && var == VAR_SOUNDCARD && b == 5)
+ b = a;
+
if (b == a)
ignoreScriptWord();
else
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui ListWidget.cpp,1.3,1.4 ListWidget.h,1.2,1.3 ScrollBarWidget.cpp,1.1.1.1,1.2 dialog.cpp,1.8,1.9 dialog.h,1.2,1.3 widget.cpp,1.2,1.3 widget.h,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm Makefile,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list