libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clearMsgQueue now just is a synonym for stopTalk -> remove it

Browse Source 
svn-id: r13300
This commit is contained in:
Max Horn 2004-03-15 03:24:29 +00:00
parent e1b25fb721
commit ac11c62312
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scumm/actor.cpp
View File

@ -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;

2
scumm/script_v5.cpp
View File

@ -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)

2
scumm/script_v6.cpp
View File

@ -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;

2
scumm/scumm.cpp
View File

@ -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;

2
scumm/scumm.h
View File

@ -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;