aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'scumm')
-rw-r--r--scumm/actor.cpp6
-rw-r--r--scumm/script_v5.cpp2
-rw-r--r--scumm/script_v6.cpp2
-rw-r--r--scumm/scumm.cpp2
-rw-r--r--scumm/scumm.h2
5 files changed, 4 insertions, 10 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 4da2d37b84..c583a04771 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -568,7 +568,7 @@ void Actor::setDirection(int direction) {
void Actor::putActor(int dstX, int dstY, byte newRoom) {
if (visible && _vm->_currentRoom != newRoom && _vm->talkingActor() == number) {
- _vm->clearMsgQueue();
+ _vm->stopTalk();
}
// HACK: The green transparency of the tank in the Hall of Oddities is
@@ -1224,10 +1224,6 @@ void ScummEngine::stopTalk() {
_charset->restoreCharsetBg();
}
-void ScummEngine::clearMsgQueue() {
- stopTalk();
-}
-
void Actor::setActorCostume(int c) {
int i;
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 2f294568c2..acb95c9dcc 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1649,7 +1649,7 @@ void ScummEngine_v5::o5_putActorInRoom() {
a = derefActor(act, "o5_putActorInRoom");
if (a->visible && _currentRoom != room && talkingActor() == a->number) {
- clearMsgQueue();
+ stopTalk();
}
a->room = room;
if (!room)
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 4dc25063fc..454fdd2934 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1162,7 +1162,7 @@ void ScummEngine_v6::o6_putActorAtXY() {
room = a->room;
} else {
if (a->visible && _currentRoom != room && talkingActor() == a->number) {
- clearMsgQueue();
+ stopTalk();
}
if (room != 0)
a->room = room;
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 0a5587f433..38726f9f09 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1963,7 +1963,7 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
CHECK_HEAP;
debugC(DEBUG_GENERAL, "Loading room %d", room);
- clearMsgQueue();
+ stopTalk();
fadeOut(_switchRoomEffect2);
_newEffect = _switchRoomEffect;
diff --git a/scumm/scumm.h b/scumm/scumm.h
index c329bcaa3a..2561ad0de7 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1071,8 +1071,6 @@ protected:
void addStringToStack(int var);
void unkMessage1(const byte *msg);
void unkMessage2(const byte *msg);
-public:
- void clearMsgQueue(); // Used by Actor::putActor
protected:
byte *_msgPtrToAdd;
bool _keepText;