[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.135,1.136 actor.h,1.75,1.76
Andrew Kurushin
h00ligan at users.sourceforge.net
Fri Jun 3 12:04:56 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_52.png,NONE,1.1 big_scummvm_53.png,NONE,1.1 big_scummvm_54.png,NONE,1.1 big_scummvm_55.png,NONE,1.1 scummvm_52.png,NONE,1.1 scummvm_52.txt,NONE,1.1 scummvm_53.png,NONE,1.1 scummvm_53.txt,NONE,1.1 scummvm_54.png,NONE,1.1 scummvm_54.txt,NONE,1.1 scummvm_55.png,NONE,1.1 scummvm_55.txt,NONE,1.1
- Next message: [Scummvm-cvs-logs] CVS: tools .cvsignore,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14234
Modified Files:
actor.cpp actor.h
Log Message:
fixed doorkeeper's nonstop speech
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- actor.cpp 31 May 2005 01:03:12 -0000 1.135
+++ actor.cpp 3 Jun 2005 19:04:20 -0000 1.136
@@ -569,7 +569,9 @@
error("Actor::updateActorsScene _vm->_scene->currentSceneNumber() == 0");
}
+ _vm->_sound->stopVoice();
_activeSpeech.stringsCount = 0;
+ _activeSpeech.playing = false;
_protagonist = NULL;
for (i = 0; i < _actorsCount; i++) {
@@ -1711,7 +1713,7 @@
return true;
}
-void Actor::actorSpeech(uint16 actorId, const char **strings, int stringsCount, uint16 sampleResourceId, int speechFlags) {
+void Actor::actorSpeech(uint16 actorId, const char **strings, int stringsCount, int sampleResourceId, int speechFlags) {
ActorData *actor;
int i;
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- actor.h 31 May 2005 01:03:13 -0000 1.75
+++ actor.h 3 Jun 2005 19:04:21 -0000 1.76
@@ -488,7 +488,7 @@
void realLocation(Location &location, uint16 objectId, uint16 walkFlags);
// speech
- void actorSpeech(uint16 actorId, const char **strings, int stringsCount, uint16 sampleResourceId, int speechFlags);
+ void actorSpeech(uint16 actorId, const char **strings, int stringsCount, int sampleResourceId, int speechFlags);
void nonActorSpeech(const char **strings, int stringsCount, int speechFlags);
void simulSpeech(const char *string, uint16 *actorIds, int actorIdsCount, int speechFlags, int sampleResourceId);
void setSpeechColor(int speechColor, int outlineColor) {
- Previous message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_52.png,NONE,1.1 big_scummvm_53.png,NONE,1.1 big_scummvm_54.png,NONE,1.1 big_scummvm_55.png,NONE,1.1 scummvm_52.png,NONE,1.1 scummvm_52.txt,NONE,1.1 scummvm_53.png,NONE,1.1 scummvm_53.txt,NONE,1.1 scummvm_54.png,NONE,1.1 scummvm_54.txt,NONE,1.1 scummvm_55.png,NONE,1.1 scummvm_55.txt,NONE,1.1
- Next message: [Scummvm-cvs-logs] CVS: tools .cvsignore,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list