From 320f1e30597d80dc217fdb9e37945a02cfb22520 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 17 Jul 2012 14:15:47 +0100
Subject: TEENAGENT: Improve readability of displayCutsceneMessage() calls.

---
 engines/teenagent/callbacks.cpp | 10 +++++-----
 engines/teenagent/teenagent.cpp |  6 +++---
 engines/teenagent/teenagent.h   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index bd7d6f3f64..9d056ce8e0 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -2204,7 +2204,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			SET_FLAG(0xdbe6, 1);
 			setOns(1, 0x66);
 			moveTo(224, 194, 0, true);
-			displayCutsceneMessage(0x57df, 30423);
+			displayCutsceneMessage(0x57df, 23, 95);
 			inventory->remove(0x59);
 			enableOn(true);
 		} else
@@ -3241,7 +3241,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 		playActorAnimation(754);
 		hideActor();
 
-		displayCutsceneMessage(0x517b, 30430);
+		displayCutsceneMessage(0x517b, 30, 95);
 
 		playMusic(3);
 		loadScene(11, scene->getPosition());
@@ -3954,7 +3954,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			for (uint i = 0; i < 8; ++i)
 				playSound(26, 30 + i * 11);
 			playActorAnimation(661);
-			displayCutsceneMessage(0x3c80, 30484);
+			displayCutsceneMessage(0x3c80, 84, 95);
 			playSound(56, 10);
 			playSound(56, 21);
 
@@ -3968,7 +3968,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			waitAnimation();
 			setOns(1, 49);
 
-			displayCutsceneMessage(0x3c9a, 30453);
+			displayCutsceneMessage(0x3c9a, 53, 95);
 			moveTo(162, 184, 0, true);
 			playSound(26, 6);
 			playSound(26, 17);
@@ -4052,7 +4052,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 				byte id = scene->getId();
 
 				playMusic(11);
-				displayCutsceneMessage(0x580a, 30484);
+				displayCutsceneMessage(0x580a, 84, 95);
 				processCallback(ptr);
 				playMusic(6);
 				if (getFlag(0xdbec) != 1 || ptr != 0x9f3e) // ptr check eq. scene_id == 11
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 74f0be4adc..e38cdfab13 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -818,12 +818,12 @@ void TeenAgentEngine::displayCredits() {
 	scene->push(event);
 }
 
-void TeenAgentEngine::displayCutsceneMessage(uint16 addr, uint16 position) {
+void TeenAgentEngine::displayCutsceneMessage(uint16 addr, uint16 x, uint16 y) {
 	SceneEvent event(SceneEvent::kCreditsMessage);
 
 	event.message = parseMessage(addr);
-	event.dst.x = position % 320;
-	event.dst.y = position / 320;
+	event.dst.x = x;
+	event.dst.y = y;
 	event.lan = 7;
 
 	scene->push(event);
diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h
index 823f096ebc..9f51073157 100644
--- a/engines/teenagent/teenagent.h
+++ b/engines/teenagent/teenagent.h
@@ -104,7 +104,7 @@ public:
 	void displayAsyncMessage(uint16 addr, uint16 position, uint16 first_frame, uint16 last_frame, byte color = 0xd1);
 	void displayAsyncMessageInSlot(uint16 addr, byte slot, uint16 first_frame, uint16 last_frame, byte color = 0xd1);
 	void displayCredits(uint16 addr, uint16 timer = 0);
-	void displayCutsceneMessage(uint16 addr, uint16 position);
+	void displayCutsceneMessage(uint16 addr, uint16 x, uint16 y);
 	void moveTo(const Common::Point &dst, byte o, bool warp = false);
 	void moveTo(uint16 x, uint16 y, byte o, bool warp = false);
 	void moveTo(Object *obj);
-- 
cgit v1.2.3