ACCESS: Fix restoring screen after offering a character an inventory …

…item
scummvm · Dec 13, 2014 · 4ce87a5 · 4ce87a5
1 parent 4448929
commit 4ce87a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
@@ -113,7 +113,7 @@ int InventoryManager::newDisplayInv() {
 	_invModeFlag = true;
 	_vm->_timers.saveTimers();
 
-	if (room._tile && !_invRefreshFlag) {
+	if (!room._tile && !_invRefreshFlag) {
 		saveScreens();
 	}
 
@@ -360,6 +360,9 @@ void InventoryManager::restoreScreens() {
 	_vm->_buffer1.w = _vm->_buffer1.pitch;
 	_savedBuffer1.copyTo(&_vm->_buffer1);
 	_savedScreen.copyTo(_vm->_screen);
+
+	_savedBuffer1.free();
+	_savedScreen.free();
 }
 
 void InventoryManager::outlineIcon(int itemIndex) {

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
@@ -163,6 +163,7 @@ void Room::clearRoom() {
 	_vm->_scripts->freeScriptData();
 	_vm->freeCells();
 	freePlayField();
+	freeTileData();
 	_vm->freeInactiveData();
 	_vm->_player->freeSprites();
 }