[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.235,1.236
Travis Howell
kirben at users.sourceforge.net
Thu Aug 12 18:03:26 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.23,1.24 input.cpp,1.11,1.12 interface.cpp,1.20,1.21 interface.h,1.5,1.6 saga.cpp,1.46,1.47 scene.cpp,1.34,1.35 script.cpp,1.20,1.21 script.h,1.12,1.13 sdata.cpp,1.13,1.14 sdata.h,1.4,1.5 sdebug.cpp,1.16,1.17 sfuncs.cpp,1.15,1.16 sthread.cpp,1.21,1.22 script_mod.h,1.6,NONE sfuncs.h,1.5,NONE sthread.h,1.8,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.54.2.16,1.54.2.17 TODO,1.79.2.3,1.79.2.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12210/scumm
Modified Files:
string.cpp
Log Message:
Ooos
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- string.cpp 12 Aug 2004 04:19:47 -0000 1.235
+++ string.cpp 13 Aug 2004 01:02:24 -0000 1.236
@@ -53,10 +53,11 @@
// Sam and Max uses a caching system, printing empty messages
// and setting VAR_V6_SOUNDMODE beforehand. See patch 609791.
- if (_gameId == GID_SAMNMAX && VAR(VAR_V6_SOUNDMODE) != 2)
+ if (_gameId == GID_SAMNMAX)
channel = VAR(VAR_V6_SOUNDMODE);
- _sound->talkSound(a, b, 1, channel);
+ if (channel != 2)
+ _sound->talkSound(a, b, 1, channel);
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.23,1.24 input.cpp,1.11,1.12 interface.cpp,1.20,1.21 interface.h,1.5,1.6 saga.cpp,1.46,1.47 scene.cpp,1.34,1.35 script.cpp,1.20,1.21 script.h,1.12,1.13 sdata.cpp,1.13,1.14 sdata.h,1.4,1.5 sdebug.cpp,1.16,1.17 sfuncs.cpp,1.15,1.16 sthread.cpp,1.21,1.22 script_mod.h,1.6,NONE sfuncs.h,1.5,NONE sthread.h,1.8,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.54.2.16,1.54.2.17 TODO,1.79.2.3,1.79.2.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list