[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
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 14 19:43:00 CET 2004
- Previous message: [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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.382,1.383
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29979
Modified Files:
actor.cpp script_v5.cpp script_v6.cpp scumm.cpp scumm.h
sound.cpp string.cpp
Log Message:
disambiguate the two talkingActor() methods (one was a getter, one a setter -- reflect that in the name)
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- actor.cpp 15 Mar 2004 03:24:29 -0000 1.239
+++ actor.cpp 15 Mar 2004 03:33:08 -0000 1.240
@@ -567,7 +567,7 @@
}
void Actor::putActor(int dstX, int dstY, byte newRoom) {
- if (visible && _vm->_currentRoom != newRoom && _vm->talkingActor() == number) {
+ if (visible && _vm->_currentRoom != newRoom && _vm->getTalkingActor() == number) {
_vm->stopTalk();
}
@@ -789,14 +789,14 @@
// V1 Maniac doesn't have a ScummVar for VAR_TALK_ACTOR, and just uses
// an internal variable. Emulate this to prevent overwriting script vars...
-int ScummEngine::talkingActor() {
+int ScummEngine::getTalkingActor() {
if (_gameId == GID_MANIAC && _version == 1)
return _V1_talkingActor;
else
return VAR(VAR_TALK_ACTOR);
};
-void ScummEngine::talkingActor(int value) {
+void ScummEngine::setTalkingActor(int value) {
if (_gameId == GID_MANIAC && _version == 1)
_V1_talkingActor = value;
else
@@ -1158,7 +1158,7 @@
if (_actorToPrintStrFor == 0xFF) {
if (!_keepText)
stopTalk();
- talkingActor(0xFF);
+ setTalkingActor(0xFF);
} else {
int oldact;
@@ -1174,21 +1174,21 @@
} else {
if (!_keepText)
stopTalk();
- talkingActor(a->number);
+ setTalkingActor(a->number);
if (!_string[0].no_talk_anim) {
a->startAnimActor(a->talkStartFrame);
_useTalkAnims = true;
}
- oldact = talkingActor();
+ oldact = getTalkingActor();
}
if (oldact >= 0x80)
return;
}
- if (((_gameId == GID_MANIAC) && (_version == 1)) || talkingActor() > 0x7F) {
+ if (((_gameId == GID_MANIAC) && (_version == 1)) || getTalkingActor() > 0x7F) {
_charsetColor = (byte)_string[0].color;
} else {
- a = derefActor(talkingActor(), "actorTalk(2)");
+ a = derefActor(getTalkingActor(), "actorTalk(2)");
_charsetColor = a->talkColor;
}
_charsetBufPos = 0;
@@ -1208,7 +1208,7 @@
_haveMsg = 0;
_talkDelay = 0;
- act = talkingActor();
+ act = getTalkingActor();
if (act && act < 0x80) {
Actor *a = derefActor(act, "stopTalk");
if ((a->isInCurrentRoom() && _useTalkAnims) || (_features & GF_NEW_COSTUMES)) {
@@ -1216,10 +1216,10 @@
_useTalkAnims = false;
}
if (!(_features & GF_HUMONGOUS))
- talkingActor(0xFF);
+ setTalkingActor(0xFF);
}
if (_features & GF_HUMONGOUS)
- talkingActor(0);
+ setTalkingActor(0);
_keepText = false;
_charset->restoreCharsetBg();
}
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- script_v5.cpp 15 Mar 2004 03:24:29 -0000 1.231
+++ script_v5.cpp 15 Mar 2004 03:33:08 -0000 1.232
@@ -1648,7 +1648,7 @@
a = derefActor(act, "o5_putActorInRoom");
- if (a->visible && _currentRoom != room && talkingActor() == a->number) {
+ if (a->visible && _currentRoom != room && getTalkingActor() == a->number) {
stopTalk();
}
a->room = room;
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- script_v6.cpp 15 Mar 2004 03:24:29 -0000 1.319
+++ script_v6.cpp 15 Mar 2004 03:33:08 -0000 1.320
@@ -1161,7 +1161,7 @@
if (room == 0xFF || room == 0x7FFFFFFF) {
room = a->room;
} else {
- if (a->visible && _currentRoom != room && talkingActor() == a->number) {
+ if (a->visible && _currentRoom != room && getTalkingActor() == a->number) {
stopTalk();
}
if (room != 0)
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- scumm.cpp 15 Mar 2004 03:24:29 -0000 1.4
+++ scumm.cpp 15 Mar 2004 03:33:08 -0000 1.5
@@ -1238,7 +1238,7 @@
VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
VAR(VAR_CHARINC) = 4;
- talkingActor(0);
+ setTalkingActor(0);
}
#pragma mark -
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- scumm.h 15 Mar 2004 03:24:29 -0000 1.381
+++ scumm.h 15 Mar 2004 03:33:08 -0000 1.382
@@ -777,8 +777,8 @@
int16 _talkDelay;
void actorTalk(const byte *msg);
void stopTalk();
- int talkingActor(); // Wrapper around VAR_TALK_ACTOR for V1 Maniac
- void talkingActor(int variable);
+ int getTalkingActor(); // Wrapper around VAR_TALK_ACTOR for V1 Maniac
+ void setTalkingActor(int variable);
// Costume class
void cost_decodeData(Actor *a, int frame, uint usemask);
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- sound.cpp 22 Feb 2004 14:11:13 -0000 1.321
+++ sound.cpp 15 Mar 2004 03:33:08 -0000 1.322
@@ -423,7 +423,7 @@
_talk_sound_mode = 0;
}
- const int act = _vm->talkingActor();
+ const int act = _vm->getTalkingActor();
if ((_sfxMode & 2) && act != 0) {
Actor *a;
bool b, finished;
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- string.cpp 15 Mar 2004 03:22:36 -0000 1.202
+++ string.cpp 15 Mar 2004 03:33:08 -0000 1.203
@@ -98,14 +98,14 @@
if (!_haveMsg)
return;
- if (!(_features & GF_NEW_CAMERA) && !(_gameId == GID_ZAK256 && talkingActor() == 0xFF)) {
+ if (!(_features & GF_NEW_CAMERA) && !(_gameId == GID_ZAK256 && getTalkingActor() == 0xFF)) {
if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x)
return;
}
a = NULL;
- if (talkingActor() != 0xFF)
- a = derefActorSafe(talkingActor(), "CHARSET_1");
+ if (getTalkingActor() != 0xFF)
+ a = derefActorSafe(getTalkingActor(), "CHARSET_1");
if (a && _string[0].overhead != 0) {
if (_version <= 5) {
- Previous message: [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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.382,1.383
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list