From ed645e435a641cc3be95bfe946d2c08d2ab3836b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 Aug 2014 21:07:27 -0400
Subject: ACCESS: Fix clearing pending images list each frame

---
 engines/access/access.cpp | 2 --
 engines/access/access.h   | 2 --
 engines/access/room.cpp   | 6 ++----
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 9b10e4f8c3..3a773a94c1 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -60,8 +60,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_converseMode = 0;
 	_startAboutBox = 0;
 	_startTravelBox = 0;
-	_numImages = 0;
-	_nextImage = 0;
 	_numAnimTimers = 0;
 	_startup = 0;
 	_currentCharFlag = false;
diff --git a/engines/access/access.h b/engines/access/access.h
index 770bd030ff..08b5ae3935 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -142,8 +142,6 @@ public:
 	int _selectCommand;
 	bool _normalMouse;
 	int _mouseMode;
-	int _numImages;
-	int _nextImage;
 
 	int _currentManOld;
 	byte *_man;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index cd39109e63..3e9e9e65aa 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -57,10 +57,9 @@ void Room::doRoom() {
 
 	while (!_vm->shouldQuit()) {
 		if (!reloadFlag) {
-			_vm->_numImages = 0;
+			_vm->_images.clear();
 			_vm->_newRects.clear();
 			_vm->_oldRects.clear();
-			_vm->_nextImage = 0;
 			_vm->_numAnimTimers = 0;
 
 			reloadRoom();
@@ -71,7 +70,7 @@ void Room::doRoom() {
 		_function = 0;
 
 		while (!_vm->shouldQuit()) {
-			_vm->_numImages = 0;
+			_vm->_images.clear();
 			if (_vm->_startup != -1 && --_vm->_startup != 0) {
 				_vm->_events->showCursor();
 				_vm->_screen->fadeIn();
@@ -84,7 +83,6 @@ void Room::doRoom() {
 			// Handle any events
 			_vm->_events->pollEvents();
 
-			_vm->_nextImage = 0;
 			_vm->_player->walk();
 			_vm->_sound->midiRepeat();
 			_vm->_screen->checkScroll();
-- 
cgit v1.2.3