3 files changed, 21 insertions, 14 deletions

diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index b827e5135b..30795c199f 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -88,6 +88,8 @@ bool CloudsCutscenes::showCloudsIntro() {
 	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
+	Windows &windows = *_vm->_windows;
+
 	SpriteResource stars("stars.vga"), intro1("intro1.vga"),
 		lake("lake.vga"), xeen("xeen.vga"), wizTower("wiztower.vga"),
 		wizTower2("wiztwer2.vga"), lake2("lake2.vga"), lake3("lake3.vga"),
@@ -216,7 +218,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 	groupo.draw(screen, 0);
 	groupo.draw(screen, 1, Common::Point(160, 0));
 	crodo.draw(screen, 0, Common::Point(0, -5));
-	screen._windows[0].writeString(Res.CLOUDS_INTRO1);
+	windows[0].writeString(Res.CLOUDS_INTRO1);
 
 	// Unroll a scroll
 	if (doScroll(false, true))
@@ -284,7 +286,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 			case 12:
 			case 13: {
 				crodo.draw(screen, 0, Common::Point(0, -5));
-				screen._windows[0].writeString(Res.CLOUDS_INTRO1);
+				windows[0].writeString(Res.CLOUDS_INTRO1);
 
 				ctr5 = (ctr5 + 1) % 19;
 				WAIT(1);
@@ -297,7 +299,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 				if (lookup > 30)
 					lookup = 30;
 				frameCtr = _INTRO_FRAMES_VALS[_INTRO_FRAMES_LOOKUP[lineCtr]][lookup];
-				screen._windows[0].writeString(Res.CLOUDS_INTRO1);
+				windows[0].writeString(Res.CLOUDS_INTRO1);
 
 				ctr5 = (ctr5 + 1) % 19;
 				WAIT(1);
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index 83d9323f31..b3029463b9 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -1182,6 +1182,7 @@ void DarkSideCutscenes::showPharaohEndText(const char *msg1, const char *msg2, c
 	};
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
+	Windows &windows = *_vm->_windows;
 	SpriteResource claw("claw.int");
 	SpriteResource dragon1("dragon1.int");
 	int numPages = 0 + (msg1 ? 1 : 0) + (msg2 ? 1 : 0) + (msg3 ? 1 : 0);
@@ -1213,11 +1214,11 @@ void DarkSideCutscenes::showPharaohEndText(const char *msg1, const char *msg2, c
 			// Form the text string to display the text
 			Common::String str1 = Common::String::format(Res.PHAROAH_ENDING_TEXT1,
 				text[pageNum]);
-			screen._windows[39].writeString(str1);
+			windows[39].writeString(str1);
 
 			Common::String str2 = Common::String::format(Res.PHAROAH_ENDING_TEXT2,
 				text[pageNum]);
-			screen._windows[39].writeString(str2);
+			windows[39].writeString(str2);
 
 			idx = (idx + 1) % 32;
 			screen.update();
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index fb25ba1757..919b003b1c 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -53,12 +53,13 @@ void WorldOfXeenMenu::show(XeenEngine *vm) {
 void WorldOfXeenMenu::execute() {
 	SpriteResource special("special.icn");
 	Screen &screen = *_vm->_screen;
+	Windows &windows = *_vm->_windows;
 	EventsManager &events = *_vm->_events;
 
 	File newBright("newbrigh.m");
 	_vm->_sound->playSong(newBright);
 
-	screen._windows[GAME_WINDOW].setBounds(Common::Rect(72, 25, 248, 175));
+	windows[GAME_WINDOW].setBounds(Common::Rect(72, 25, 248, 175));
 
 	Common::String title1, title2;
 	startup(title1, title2);
@@ -129,6 +130,7 @@ void WorldOfXeenMenu::showTitles2() {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 	Sound &sound = *_vm->_sound;
+	Windows &windows = *_vm->_windows;
 
 	SpriteResource titleSprites("title2b.raw");
 	SpriteResource kludgeSprites("kludge.int");
@@ -147,7 +149,7 @@ void WorldOfXeenMenu::showTitles2() {
 		events.updateGameCounter();
 		screen.restoreBackground();
 		title2Sprites[i / 4].draw(screen, i % 4);
-		screen._windows[0].update();
+		windows[0].update();
 
 		if (i == 19)
 			sound.stopSound();
@@ -157,7 +159,7 @@ void WorldOfXeenMenu::showTitles2() {
 	}
 
 	screen.restoreBackground();
-	screen._windows[0].update();
+	windows[0].update();
 }
 
 void WorldOfXeenMenu::setupButtons(SpriteResource *buttons) {
@@ -208,23 +210,25 @@ void WorldOptionsMenu::setBackground(bool doFade) {
 }
 
 void WorldOptionsMenu::openWindow() {
-	_vm->_screen->_windows[GAME_WINDOW].open();
+	Windows &windows = *_vm->_windows;
+	windows[GAME_WINDOW].open();
 }
 
 void WorldOptionsMenu::showContents(SpriteResource &title1, bool waitFlag) {
-	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	Windows &windows = *_vm->_windows;
 	events.updateGameCounter();
 
 	// Draw the background frame in a continous cycle
 	_bgFrame = (_bgFrame + 1) % 5;
-	title1.draw(screen._windows[0], _bgFrame);
+	title1.draw(windows[0], _bgFrame);
 
 	// Draw the basic frame for the optitons menu and title text
-	screen._windows[GAME_WINDOW].frame();
-	screen._windows[GAME_WINDOW].writeString(Res.OPTIONS_TITLE);
+	windows[GAME_WINDOW].frame();
+	windows[GAME_WINDOW].writeString(Res.OPTIONS_TITLE);
 
-	drawButtons(&screen._windows[0]);
+	drawButtons(&windows[0]);
 	screen.update();
 
 	if (waitFlag) {