From e0e0247b4701fef4817666da34c733624881fec2 Mon Sep 17 00:00:00 2001
From: Joost Peters
Date: Tue, 29 Apr 2003 17:42:07 +0000
Subject: changed return type for displayText()

svn-id: r7201
---
 sky/struc.h  |  5 +++++
 sky/text.cpp | 12 ++++++++----
 sky/text.h   |  4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/sky/struc.h b/sky/struc.h
index c7bdd8c417..295fdf40e6 100644
--- a/sky/struc.h
+++ b/sky/struc.h
@@ -22,6 +22,11 @@
 #ifndef SKYSTRUC_H
 #define SKYSTRUC_H
 
+struct displayText_t {
+	byte *textData;	
+	uint32 textWidth;
+};
+
 struct dataFileHeader {
 	uint16 flag; // bit 0: set for colour data, clear for not
 	// bit 1: set for compressed, clear for uncompressed
diff --git a/sky/text.cpp b/sky/text.cpp
index 10b3600085..ddd7a19898 100644
--- a/sky/text.cpp
+++ b/sky/text.cpp
@@ -163,12 +163,12 @@ bool SkyText::getTBit() {
 	return (bool)(((_inputValue) >> (_shiftBits)) & 1);
 }
 
-void SkyText::displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
+displayText_t SkyText::displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
 	//Render text in _textBuffer in buffer *dest
-	displayText(this->_textBuffer, dest, centre, pixelWidth, color);
+	return displayText(this->_textBuffer, dest, centre, pixelWidth, color);
 }
 
-void SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
+displayText_t SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
 	
 	//Render text pointed to by *textPtr in buffer *dest
 
@@ -272,7 +272,11 @@ void SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelW
 		prevDest = curDest;
 
 	} while (textChar >= 10);
-			
+	
+	struct displayText_t ret;
+	ret.textData = _dtData;
+	ret.textWidth = _dtLastWidth;	
+	return ret;
 }
 
 void SkyText::makeGameCharacter(char textChar, uint8 *charSetPtr, uint8 *&dest, uint8 color) {
diff --git a/sky/text.h b/sky/text.h
index 6b1abf37da..a6ecd1f1c4 100644
--- a/sky/text.h
+++ b/sky/text.h
@@ -28,8 +28,8 @@ class SkyText {
 public:
 	SkyText(SkyDisk *skyDisk, uint32 gameVersion);
 	void getText(uint32 textNr, uint16 language);
-	void displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
-	void displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
+	struct displayText_t displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
+	struct displayText_t displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
 	void makeGameCharacter(char textChar, uint8 *charSetPtr, uint8 *&data, uint8 color);
 
 protected:
-- 
cgit v1.2.3