From b50d425387ff88a09a8654fd5cd8ad76fc27a412 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 16 Mar 2016 01:05:02 +0200
Subject: SCI32: Global 12 contains the previous room

---
 engines/sci/graphics/frameout.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 99abb92151..308a3a1da2 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -826,9 +826,7 @@ void GfxFrameout::palMorphFrameOut(const int8 *styleRanges, const ShowStyleEntry
 	Palette sourcePalette(*_palette->getNextPalette());
 	alterVmap(sourcePalette, sourcePalette, -1, styleRanges);
 
-	// TODO: unsure if this is what this variable actually
-	// represents, but it is the correct variable number
-	int16 lastRoom = g_sci->getEngineState()->variables[VAR_GLOBAL][12].toSint16();
+	int16 prevRoom = g_sci->getEngineState()->variables[VAR_GLOBAL][12].toSint16();
 
 	Common::Rect rect(_screen->getDisplayWidth(), _screen->getDisplayHeight());
 	_showList.add(rect);
@@ -869,7 +867,7 @@ void GfxFrameout::palMorphFrameOut(const int8 *styleRanges, const ShowStyleEntry
 
 	Palette nextPalette(*_palette->getNextPalette());
 
-	if (lastRoom < 1000) {
+	if (prevRoom < 1000) {
 		for (int i = 0; i < ARRAYSIZE(sourcePalette.colors); ++i) {
 			if (styleRanges[i] == -1 || styleRanges[i] == 0) {
 				sourcePalette.colors[i] = nextPalette.colors[i];
-- 
cgit v1.2.3