[Scummvm-cvs-logs] CVS: scummvm/saga sthread.cpp,1.40,1.41
Andrew Kurushin
h00ligan at users.sourceforge.net
Fri Dec 17 03:16:02 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.474,1.475
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.36,1.37 actor.h,1.16,1.17 music.cpp,1.38,1.39 sfuncs.cpp,1.44,1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9178
Modified Files:
sthread.cpp
Log Message:
actors rearrangement bugfix
Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- sthread.cpp 15 Dec 2004 00:24:11 -0000 1.40
+++ sthread.cpp 17 Dec 2004 11:15:12 -0000 1.41
@@ -720,7 +720,7 @@
case 0x53:
{
int n_voices;
- int a_index;
+ uint16 actorId;
int voice_rn;
n_voices = scriptS.readByte();
@@ -729,22 +729,16 @@
scriptS.readByte();
scriptS.readUint16LE();
- a_index = _vm->_actor->getActorIndex(param1);
- if (a_index < 0) {
- _vm->_console->DebugPrintf(S_WARN_PREFIX "%X: DLGP Actor id not found.\n", thread->i_offset);
- debug(9, "%X: DLGP Actor id not found.\n", thread->i_offset);
- }
+ actorId = param1;
for (i = 0; i < n_voices; i++) {
data = thread->pop();
- if (a_index < 0)
- continue;
if (!isVoiceLUTPresent()) {
voice_rn = -1;
} else {
voice_rn = currentScript()->voice->voices[data];
}
- _vm->_actor->speak(a_index, currentScript()->diag->str[data], voice_rn, &thread->sem);
+ _vm->_actor->speak(actorId, currentScript()->diag->str[data], voice_rn, &thread->sem);
}
}
break;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.474,1.475
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.36,1.37 actor.h,1.16,1.17 music.cpp,1.38,1.39 sfuncs.cpp,1.44,1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list