aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-28 22:17:23 +0000
committerMax Horn2005-04-28 22:17:23 +0000
commitc5127d3c05ec1dccb8ead61d38727e3e98dce6d1 (patch)
treef78e52873c734ef65db64012c2de532035d4d8fd /scumm/actor.cpp
parente8865cc596a19c8604f37432dd890138185b18f9 (diff)
downloadscummvm-rg350-c5127d3c05ec1dccb8ead61d38727e3e98dce6d1.tar.gz
scummvm-rg350-c5127d3c05ec1dccb8ead61d38727e3e98dce6d1.tar.bz2
scummvm-rg350-c5127d3c05ec1dccb8ead61d38727e3e98dce6d1.zip
Moved bundle based localization code to ScummEngine_v7
svn-id: r17855
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 7f797e9309..24e74ec8cb 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1301,14 +1301,18 @@ int ScummEngine::getActorFromPos(int x, int y) {
return result;
}
+void ScummEngine_v7::actorTalk(const byte *msg) {
+ ScummEngine::actorTalk(msg);
+
+ // Play associated speech, if any
+ playSpeech((byte *)_lastStringTag);
+}
+
void ScummEngine::actorTalk(const byte *msg) {
Actor *a;
addMessageToStack(msg, _charsetBuffer, sizeof(_charsetBuffer));
- // Play associated speech, if any
- playSpeech((byte *)_lastStringTag);
-
// FIXME: Workaround for bugs #770039 and #770049
if (_gameId == GID_LOOM || _gameId == GID_LOOM256) {
if (!*_charsetBuffer)