From cce0c2ff97878b2b0b8a87e25395c3ef98bc584e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 11:47:15 -0400
Subject: ACCESS: Adding sprite resources and screen saving

---
 engines/access/amazon/amazon_room.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'engines/access/amazon/amazon_room.cpp')

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 5627325f6e..056fa8f1eb 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -122,16 +122,18 @@ void AmazonRoom::roomSet() {
 }
 
 void AmazonRoom::roomMenu() {
-	_icon = _vm->_files->loadFile("ICONS.LZ");
+	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, _icon, _vm->_files->_filesize);
+	delete[] iconData;
+
 	_vm->_screen->saveScreen();
 	_vm->_screen->setDisplayScan();
-	_vm->_destIn = _vm->_screen;
-	_vm->_screen->plotImage(_icon, 0, Common::Point(0, 177));
-	_vm->_screen->plotImage(_icon, 1, Common::Point(143, 177));
+	_vm->_destIn = _vm->_screen;	// TODO: Redundant
+	_vm->_screen->plotImage(spr, 0, Common::Point(0, 177));
+	_vm->_screen->plotImage(spr, 1, Common::Point(143, 177));
 
-	_vm->_screen->restoreScan();
-	delete[] _icon;
-	_icon = nullptr;
+	_vm->_screen->restoreScreen();
+	delete spr;
 }
 
 } // End of namespace Amazon
-- 
cgit v1.2.3