From e2617f90a19f81861c09f4bd68da00d0e037a4eb Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 15 Mar 2004 03:33:08 +0000
Subject: disambiguate the two talkingActor() methods (one was a getter, one a
 setter -- reflect that in the name)

svn-id: r13301
---
 scumm/string.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scumm/string.cpp')

diff --git a/scumm/string.cpp b/scumm/string.cpp
index bdd30a0136..3dc4fd14e4 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -98,14 +98,14 @@ void ScummEngine::CHARSET_1() {
 	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) {
-- 
cgit v1.2.3