[Scummvm-git-logs] scummvm master -> 807a8b6cc79f560bcdf054449d254c3b90cd603a

dreammaster dreammaster at scummvm.org
Mon Apr 2 05:34:35 CEST 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
807a8b6cc7 XEEN: Fix entering the Witch Tower


Commit: 807a8b6cc79f560bcdf054449d254c3b90cd603a
    https://github.com/scummvm/scummvm/commit/807a8b6cc79f560bcdf054449d254c3b90cd603a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-01T23:34:34-04:00

Commit Message:
XEEN: Fix entering the Witch Tower

Changed paths:
    engines/xeen/locations.cpp


diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 9b0eec3..ca7682b 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -1280,6 +1280,7 @@ int ReaperCutscene::show() {
 
 	Graphics::ManagedSurface savedBg;
 	savedBg.copyFrom(screen);
+	getNewLocation();
 
 	for (int idx = 13; idx >= 0; --idx) {
 		events.updateGameCounter();
@@ -2260,6 +2261,7 @@ int LocationManager::doAction(LocationAction actionId) {
 	}
 
 	// Show the location
+	g_vm->_events->clearEvents();
 	int result = _location->show();
 	delete _location;
 	_location = nullptr;





More information about the Scummvm-git-logs mailing list