SCI: Some fixes for text positioning in SCI32 games (still WIP)

Also, removed duplicate code

3 files changed, 34 insertions, 51 deletions

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 0a04b40ae4..aa53576b13 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -488,12 +488,10 @@ void GfxFrameout::kernelFrameout() {
 				itemEntry->picture->drawSci32Vga(itemEntry->celNo, pictureX, itemEntry->y, pictureOffsetX, pictureOffsetY, it->planePictureMirrored);
 //				warning("picture cel %d %d", itemEntry->celNo, itemEntry->priority);
 
-			} else if (itemEntry->viewId != 0xFFFF) {
-				GfxView *view = _cache->getView(itemEntry->viewId);
-
-//				warning("view %s %04x:%04x", _segMan->getObjectName(itemEntry->object), PRINT_REG(itemEntry->object));
-
-				if (view->isSci2Hires()) {
+			} else {
+				GfxView *view = (itemEntry->viewId != 0xFFFF) ? _cache->getView(itemEntry->viewId) : NULL;
+				
+				if (view && view->isSci2Hires()) {
 					int16 dummyX = 0;
 					view->adjustToUpscaledCoordinates(itemEntry->y, itemEntry->x);
 					view->adjustToUpscaledCoordinates(itemEntry->z, dummyX);
@@ -513,24 +511,27 @@ void GfxFrameout::kernelFrameout() {
 					itemEntry->celRect.left = readSelectorValue(_segMan, itemEntry->object, SELECTOR(inLeft));
 					itemEntry->celRect.bottom = readSelectorValue(_segMan, itemEntry->object, SELECTOR(inBottom)) + 1;
 					itemEntry->celRect.right = readSelectorValue(_segMan, itemEntry->object, SELECTOR(inRight)) + 1;
-					if (view->isSci2Hires()) {
+					if (view && view->isSci2Hires()) {
 						view->adjustToUpscaledCoordinates(itemEntry->celRect.top, itemEntry->celRect.left);
 						view->adjustToUpscaledCoordinates(itemEntry->celRect.bottom, itemEntry->celRect.right);
 					}
 					itemEntry->celRect.translate(itemEntry->x, itemEntry->y);
 					// TODO: maybe we should clip the cels rect with this, i'm not sure
 					//  the only currently known usage is game menu of gk1
-				} else {
-					if ((itemEntry->scaleX == 128) && (itemEntry->scaleY == 128))
-						view->getCelRect(itemEntry->loopNo, itemEntry->celNo, itemEntry->x, itemEntry->y, itemEntry->z, itemEntry->celRect);
-					else
-						view->getCelScaledRect(itemEntry->loopNo, itemEntry->celNo, itemEntry->x, itemEntry->y, itemEntry->z, itemEntry->scaleX, itemEntry->scaleY, itemEntry->celRect);
+				} else if (view) {
+						if ((itemEntry->scaleX == 128) && (itemEntry->scaleY == 128))
+							view->getCelRect(itemEntry->loopNo, itemEntry->celNo,
+								itemEntry->x, itemEntry->y, itemEntry->z, itemEntry->celRect);
+						else
+							view->getCelScaledRect(itemEntry->loopNo, itemEntry->celNo, 
+								itemEntry->x, itemEntry->y, itemEntry->z, itemEntry->scaleX,
+								itemEntry->scaleY, itemEntry->celRect);
 
 					Common::Rect nsRect = itemEntry->celRect;
 					// Translate back to actual coordinate within scrollable plane
 					nsRect.translate(it->planeOffsetX, it->planeOffsetY);
 
-					if (view->isSci2Hires()) {
+					if (view && view->isSci2Hires()) {
 						view->adjustBackUpscaledCoordinates(nsRect.top, nsRect.left);
 						view->adjustBackUpscaledCoordinates(nsRect.bottom, nsRect.right);
 					} else if (getSciVersion() == SCI_VERSION_2_1) {
@@ -552,7 +553,7 @@ void GfxFrameout::kernelFrameout() {
 
 				int16 screenHeight = _screen->getHeight();
 				int16 screenWidth = _screen->getWidth();
-				if (view->isSci2Hires()) {
+				if (view && view->isSci2Hires()) {
 					screenHeight = _screen->getDisplayHeight();
 					screenWidth = _screen->getDisplayWidth();
 				}
@@ -565,7 +566,8 @@ void GfxFrameout::kernelFrameout() {
 
 				Common::Rect clipRect, translatedClipRect;
 				clipRect = itemEntry->celRect;
-				if (view->isSci2Hires()) {
+
+				if (view && view->isSci2Hires()) {
 					clipRect.clip(it->upscaledPlaneClipRect);
 					translatedClipRect = clipRect;
 					translatedClipRect.translate(it->upscaledPlaneRect.left, it->upscaledPlaneRect.top);
@@ -575,21 +577,20 @@ void GfxFrameout::kernelFrameout() {
 					translatedClipRect.translate(it->planeRect.left, it->planeRect.top);
 				}
 
-				if (!clipRect.isEmpty()) {
-					if ((itemEntry->scaleX == 128) && (itemEntry->scaleY == 128))
-						view->draw(itemEntry->celRect, clipRect, translatedClipRect, itemEntry->loopNo, itemEntry->celNo, 255, 0, view->isSci2Hires());
-					else
-						view->drawScaled(itemEntry->celRect, clipRect, translatedClipRect, itemEntry->loopNo, itemEntry->celNo, 255, itemEntry->scaleX, itemEntry->scaleY);
+				if (view) {
+					if (!clipRect.isEmpty()) {
+						if ((itemEntry->scaleX == 128) && (itemEntry->scaleY == 128))
+							view->draw(itemEntry->celRect, clipRect, translatedClipRect, 
+								itemEntry->loopNo, itemEntry->celNo, 255, 0, view->isSci2Hires());
+						else
+							view->drawScaled(itemEntry->celRect, clipRect, translatedClipRect, 
+								itemEntry->loopNo, itemEntry->celNo, 255, itemEntry->scaleX, itemEntry->scaleY);
+					}
 				}
 
-				// Draw overlay text, if it exists (e.g. on buttons)
-				if (lookupSelector(_segMan, itemEntry->object, SELECTOR(text), NULL, NULL) == kSelectorVariable) {
-					g_sci->_gfxText32->drawTextBitmap(itemEntry->object);
-				}
-			} else {
-				// Most likely a text entry
+				// Draw text, if it exists
 				if (lookupSelector(_segMan, itemEntry->object, SELECTOR(text), NULL, NULL) == kSelectorVariable) {
-					g_sci->_gfxText32->drawTextBitmap(itemEntry->object);
+					g_sci->_gfxText32->drawTextBitmap(itemEntry->x, itemEntry->y, it->planeRect, itemEntry->object);
 				}
 			}
 		}
diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index 2981a574b7..c26fbd7e34 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -63,9 +63,9 @@ reg_t GfxText32::createTextBitmap(reg_t textObject, uint16 maxWidth, uint16 maxH
 	uint16 foreColor = readSelectorValue(_segMan, textObject, SELECTOR(fore));
 	uint16 backColor = readSelectorValue(_segMan, textObject, SELECTOR(back));
 
-	Common::Rect planeRect = getPlaneRect(textObject);
-	uint16 width = planeRect.width() + 1;
-	uint16 height = planeRect.height() + 1;
+	Common::Rect nsRect = g_sci->_gfxCompare->getNSRect(textObject);
+	uint16 width = nsRect.width() + 1;
+	uint16 height = nsRect.height() + 1;
 
 	// Limit rectangle dimensions, if requested
 	if (maxWidth > 0)
@@ -119,7 +119,7 @@ void GfxText32::disposeTextBitmap(reg_t hunkId) {
 	_segMan->freeHunkEntry(hunkId);
 }
 
-void GfxText32::drawTextBitmap(reg_t textObject) {
+void GfxText32::drawTextBitmap(uint16 x, uint16 y, Common::Rect planeRect, reg_t textObject) {
 	reg_t hunkId = readSelector(_segMan, textObject, SELECTOR(bitmap));
 	// Sanity check: Check if the hunk is set. If not, either the game scripts
 	// didn't set it, or an old saved game has been loaded, where it wasn't set.
@@ -134,13 +134,10 @@ void GfxText32::drawTextBitmap(reg_t textObject) {
 	byte *surface = memoryPtr + BITMAP_HEADER_SIZE;
 
 	int curByte = 0;
-	Common::Rect planeRect = getPlaneRect(textObject);
-	uint16 x = readSelectorValue(_segMan, textObject, SELECTOR(x));
-	uint16 y = readSelectorValue(_segMan, textObject, SELECTOR(y));
 	uint16 skipColor = readSelectorValue(_segMan, textObject, SELECTOR(skip));
+	// Get totalWidth, totalHeight
 	uint16 textX = planeRect.left + x;
 	uint16 textY = planeRect.top + y;
-	// Get totalWidth, totalHeight
 	uint16 width = READ_LE_UINT16(memoryPtr);
 	uint16 height = READ_LE_UINT16(memoryPtr + 2);
 
@@ -159,20 +156,6 @@ void GfxText32::drawTextBitmap(reg_t textObject) {
 	}
 }
 
-Common::Rect GfxText32::getPlaneRect(reg_t textObject) {
-	Common::Rect planeRect(0, 0, _screen->getWidth(), _screen->getHeight());
-
-	reg_t planeObject = readSelector(_segMan, textObject, SELECTOR(plane));
-	if (!planeObject.isNull()) {
-		planeRect.top = readSelectorValue(_segMan, planeObject, SELECTOR(top));
-		planeRect.left = readSelectorValue(_segMan, planeObject, SELECTOR(left));
-		planeRect.bottom = readSelectorValue(_segMan, planeObject, SELECTOR(bottom));
-		planeRect.right = readSelectorValue(_segMan, planeObject, SELECTOR(right));
-	}
-
-	return planeRect;
-}
-
 int16 GfxText32::GetLongest(const char *text, int16 maxWidth, GfxFont *font) {
 	uint16 curChar = 0;
 	int16 maxChars = 0, curCharCount = 0;
diff --git a/engines/sci/graphics/text32.h b/engines/sci/graphics/text32.h
index dfcbf63ccf..d39f0d8d87 100644
--- a/engines/sci/graphics/text32.h
+++ b/engines/sci/graphics/text32.h
@@ -37,7 +37,7 @@ public:
 	~GfxText32();
 	reg_t createTextBitmap(reg_t textObject, uint16 maxWidth = 0, uint16 maxHeight = 0);
 	void disposeTextBitmap(reg_t hunkId);
-	void drawTextBitmap(reg_t textObject);
+	void drawTextBitmap(uint16 x, uint16 y, Common::Rect planeRect, reg_t textObject);
 	int16 GetLongest(const char *text, int16 maxWidth, GfxFont *font);
 
 	void kernelTextSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight);
@@ -46,7 +46,6 @@ private:
 	int16 Size(Common::Rect &rect, const char *text, GuiResourceId fontId, int16 maxWidth);
 	void Width(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight, bool restoreFont);
 	void StringWidth(const char *str, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight);
-	Common::Rect getPlaneRect(reg_t textObject);
 
 	SegManager *_segMan;
 	GfxCache *_cache;