[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.238,1.239 script_v5.cpp,1.230,1.231 script_v6.cpp,1.318,1.319 scumm.cpp,1.3,1.4 scumm.h,1.380,1.381
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 14 19:34:01 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.237,1.238 scumm.cpp,1.2,1.3 scumm.h,1.379,1.380 string.cpp,1.201,1.202
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.239,1.240 script_v5.cpp,1.231,1.232 script_v6.cpp,1.319,1.320 scumm.cpp,1.4,1.5 scumm.h,1.381,1.382 sound.cpp,1.321,1.322 string.cpp,1.202,1.203
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28830
Modified Files:
actor.cpp script_v5.cpp script_v6.cpp scumm.cpp scumm.h
Log Message:
clearMsgQueue now just is a synonym for stopTalk -> remove it
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- actor.cpp 15 Mar 2004 03:22:36 -0000 1.238
+++ actor.cpp 15 Mar 2004 03:24:29 -0000 1.239
@@ -568,7 +568,7 @@
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 @@
_charset->restoreCharsetBg();
}
-void ScummEngine::clearMsgQueue() {
- stopTalk();
-}
-
void Actor::setActorCostume(int c) {
int i;
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- script_v5.cpp 15 Mar 2004 03:09:48 -0000 1.230
+++ script_v5.cpp 15 Mar 2004 03:24:29 -0000 1.231
@@ -1649,7 +1649,7 @@
a = derefActor(act, "o5_putActorInRoom");
if (a->visible && _currentRoom != room && talkingActor() == a->number) {
- clearMsgQueue();
+ stopTalk();
}
a->room = room;
if (!room)
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- script_v6.cpp 15 Mar 2004 03:09:48 -0000 1.318
+++ script_v6.cpp 15 Mar 2004 03:24:29 -0000 1.319
@@ -1162,7 +1162,7 @@
room = a->room;
} else {
if (a->visible && _currentRoom != room && talkingActor() == a->number) {
- clearMsgQueue();
+ stopTalk();
}
if (room != 0)
a->room = room;
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scumm.cpp 15 Mar 2004 03:22:36 -0000 1.3
+++ scumm.cpp 15 Mar 2004 03:24:29 -0000 1.4
@@ -1963,7 +1963,7 @@
CHECK_HEAP;
debugC(DEBUG_GENERAL, "Loading room %d", room);
- clearMsgQueue();
+ stopTalk();
fadeOut(_switchRoomEffect2);
_newEffect = _switchRoomEffect;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -d -r1.380 -r1.381
--- scumm.h 15 Mar 2004 03:22:36 -0000 1.380
+++ scumm.h 15 Mar 2004 03:24:29 -0000 1.381
@@ -1071,8 +1071,6 @@
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;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.237,1.238 scumm.cpp,1.2,1.3 scumm.h,1.379,1.380 string.cpp,1.201,1.202
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.239,1.240 script_v5.cpp,1.231,1.232 script_v6.cpp,1.319,1.320 scumm.cpp,1.4,1.5 scumm.h,1.381,1.382 sound.cpp,1.321,1.322 string.cpp,1.202,1.203
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list