[Scummvm-cvs-logs] scummvm master -> 7109e65f895ac638454c0196f0054ee930b1c806

dreammaster dreammaster at scummvm.org
Fri Sep 23 15:05:39 CEST 2011


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:
7109e65f89 TSAGE: Bugfix for properly exiting scenes via hotspots


Commit: 7109e65f895ac638454c0196f0054ee930b1c806
    https://github.com/scummvm/scummvm/commit/7109e65f895ac638454c0196f0054ee930b1c806
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-23T05:57:58-07:00

Commit Message:
TSAGE: Bugfix for properly exiting scenes via hotspots

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 69b41dc..b8d1c8d 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -3817,10 +3817,6 @@ void SceneHandler::process(Event &event) {
 	if (_globals->_sceneManager._scene)
 		_globals->_sceneManager._scene->process(event);
 
-	// Handle player processing
-	if (_vm->getGameID() != GType_Ringworld)
-		_globals->_player.process(event);
-
 	if (!event.handled) {
 		// Separate check for F5 - Save key
 		if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_F5)) {
@@ -3884,8 +3880,7 @@ void SceneHandler::process(Event &event) {
 			processEnd(event);
 
 			// Handle player processing
-			if (_vm->getGameID() == GType_Ringworld)
-				_globals->_player.process(event);
+			_globals->_player.process(event);
 		}
 	}
 }






More information about the Scummvm-git-logs mailing list