TEENAGENT: Improve readability of displayMessage() calls.

3 files changed, 18 insertions, 18 deletions

diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index 85063f6c0d..f8a356cc30 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -248,11 +248,11 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 		playActorAnimation(842);
 		wait(100);
 		// shown in different positions
-		displayMessage(0x5656, 0xd1, 0x5510);
+		displayMessage(0x5656, 0xd1, 16, 68);
 		wait(50);
-		displayMessage(0x567a, 0xd1, 0x555c);
+		displayMessage(0x567a, 0xd1, 92, 68);
 		wait(50);
-		displayMessage(0x5682, 0xd1, 0x553e);
+		displayMessage(0x5682, 0xd1, 62, 68);
 		wait(50);
 		playActorAnimation(843);
 		showActor();
@@ -486,7 +486,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			moveTo(140, 152, 1);
 			if (CHECK_FLAG(0xdbe8, 1)) {
 				dialog->showMono(177, scene, 0, 0xd1, 0);
-				displayMessage(0x5883, 0xef, 21472);
+				displayMessage(0x5883, 0xef, 32, 67);
 				//reloadLan();
 				setLan(1, 0);
 				playAnimation(882, 0);
@@ -1328,15 +1328,15 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			displayMessage(0x411d);
 		} else {
 			displayMessage(0x408a);
-			displayMessage(0x4091, 0xe5, 52728);
+			displayMessage(0x4091, 0xe5, 248, 164);
 			displayMessage(0x4098);
-			displayMessage(0x40a7, 0xe5, 52705);
+			displayMessage(0x40a7, 0xe5, 225, 164);
 			displayMessage(0x40b6);
-			displayMessage(0x40ce, 0xe5, 52652);
+			displayMessage(0x40ce, 0xe5, 172, 164);
 			displayMessage(0x40e8);
-			displayMessage(0x410f, 0xe5, 52712);
+			displayMessage(0x410f, 0xe5, 232, 164);
 			wait(100);
-			displayMessage(0x4091, 0xe5, 52728);
+			displayMessage(0x4091, 0xe5, 248, 164);
 			SET_FLAG(0xdbb2, 1);
 		}
 		break;
@@ -2552,8 +2552,8 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			disableObject(15);
 			disableObject(16);
 			moveTo(162, 164, 2);
-			displayMessage(0x3d01, 0xe5, 24390);
-			displayMessage(0x3d20, 0xd8, 24410);
+			displayMessage(0x3d01, 0xe5, 70, 76);
+			displayMessage(0x3d20, 0xd8, 90, 76);
 			moveTo(162, 191, 2);
 			setOns(1, 0);
 			setOns(2, 0);
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index faa132743e..62c972fb2b 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -721,7 +721,7 @@ Common::String TeenAgentEngine::parseMessage(uint16 addr) {
 	return message;
 }
 
-void TeenAgentEngine::displayMessage(const Common::String &str, byte color, uint16 position) {
+void TeenAgentEngine::displayMessage(const Common::String &str, byte color, uint16 x, uint16 y) {
 	if (str.empty()) {
 		return;
 	}
@@ -738,8 +738,8 @@ void TeenAgentEngine::displayMessage(const Common::String &str, byte color, uint
 		event.message = str;
 		event.color = color;
 		event.slot = 0;
-		event.dst.x = position % 320;
-		event.dst.y = position / 320;
+		event.dst.x = x;
+		event.dst.y = y;
 		scene->push(event);
 	}
 
@@ -751,8 +751,8 @@ void TeenAgentEngine::displayMessage(const Common::String &str, byte color, uint
 	}
 }
 
-void TeenAgentEngine::displayMessage(uint16 addr, byte color, uint16 position) {
-	displayMessage(parseMessage(addr), color, position);
+void TeenAgentEngine::displayMessage(uint16 addr, byte color, uint16 x, uint16 y) {
+	displayMessage(parseMessage(addr), color, x, y);
 }
 
 void TeenAgentEngine::displayAsyncMessage(uint16 addr, uint16 x, uint16 y, uint16 first_frame, uint16 last_frame, byte color) {
diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h
index 895558ab10..76de709711 100644
--- a/engines/teenagent/teenagent.h
+++ b/engines/teenagent/teenagent.h
@@ -99,8 +99,8 @@ public:
 	Common::String parseMessage(uint16 addr);
 
 	//event driven:
-	void displayMessage(uint16 addr, byte color = 0xd1, uint16 position = 0);
-	void displayMessage(const Common::String &str, byte color = 0xd1, uint16 position = 0);
+	void displayMessage(uint16 addr, byte color = 0xd1, uint16 x = 0, uint16 y = 0);
+	void displayMessage(const Common::String &str, byte color = 0xd1, uint16 x = 0, uint16 y = 0);
 	void displayAsyncMessage(uint16 addr, uint16 x, uint16 y, 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);