diff options
| author | Andrew Kurushin | 2005-06-03 19:04:21 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-06-03 19:04:21 +0000 |
| commit | b58348494e1e8203159ff8a82d22be25423cfb3c (patch) | |
| tree | d8db55810aae14d3732b44146b5d37a4e17e67b2 /saga | |
| parent | 63984c3a232cf9cf686964dff742edd404c976bf (diff) | |
| download | scummvm-rg350-b58348494e1e8203159ff8a82d22be25423cfb3c.tar.gz scummvm-rg350-b58348494e1e8203159ff8a82d22be25423cfb3c.tar.bz2 scummvm-rg350-b58348494e1e8203159ff8a82d22be25423cfb3c.zip | |
fixed doorkeeper's nonstop speech
svn-id: r18327
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/actor.cpp | 4 | ||||
| -rw-r--r-- | saga/actor.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp index aeb977f525..85fae3c426 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -569,7 +569,9 @@ void Actor::updateActorsScene(int actorsEntrance) { 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 @@ bool Actor::actorWalkTo(uint16 actorId, const Location &toLocation) { 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; diff --git a/saga/actor.h b/saga/actor.h index 7c6d04c4bd..ba63c1dfb2 100644 --- a/saga/actor.h +++ b/saga/actor.h @@ -488,7 +488,7 @@ public: 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) { |