From c43f625fd814e2f3baf61d76441121bbe3554f91 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 1 Jan 2019 18:31:07 -0800
Subject: GLK: FROTZ: Added skeleton classes for ZMachine windows

---
 engines/glk/frotz/processor_windows.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/glk/frotz/processor_windows.cpp')

diff --git a/engines/glk/frotz/processor_windows.cpp b/engines/glk/frotz/processor_windows.cpp
index c0a1e3feee..ad16bbafe6 100644
--- a/engines/glk/frotz/processor_windows.cpp
+++ b/engines/glk/frotz/processor_windows.cpp
@@ -51,7 +51,8 @@ void Processor::z_draw_picture() {
 	if (!x || !y) {
 		// Currently I only support getting the cursor for the text grid area
 		assert(cwin == 1);
-		Point cursPos = gos_upper->getCursor();
+		winid_t win = _wp._upper;
+		Point cursPos = win->getCursor();
 		// use cursor column if x-coordinate is 0
 		if (!x)
 			x = cursPos.x;
@@ -82,18 +83,18 @@ void Processor::z_draw_picture() {
 			if (_storyId == ARTHUR && pic == 54)
 			delta = h_screen_width / 160;
 
-			os_draw_picture(mapper[i].pic1, gos_lower, Point(x + delta, y + height1));
-			os_draw_picture(mapper[i].pic2, gos_lower, Point(x + width1 - width2 - delta, y + height1));
+			os_draw_picture(mapper[i].pic1, _wp._lower, Point(x + delta, y + height1));
+			os_draw_picture(mapper[i].pic2, _wp._lower, Point(x + width1 - width2 - delta, y + height1));
 		}
 	}
 
-	os_draw_picture(pic, gos_lower, Point(x, y));
+	os_draw_picture(pic, _wp._lower, Point(x, y));
 
 	if (_storyId == SHOGUN && pic == 3) {
 		uint height, width;
 
 		os_picture_data(59, &height, &width);
-		os_draw_picture(59, gos_lower, Point(h_screen_width - width + 1, y));
+		os_draw_picture(59, _wp._lower, Point(h_screen_width - width + 1, y));
 	}
 }
 
-- 
cgit v1.2.3