[Scummvm-cvs-logs] scummvm master -> 68eb280116eca9154b71159af3f6c9160b6315a7

[Strangerke]

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:
68eb280116 R2R: Don't allow character to teleport (bug #6546)


Commit: 68eb280116eca9154b71159af3f6c9160b6315a7
    https://github.com/scummvm/scummvm/commit/68eb280116eca9154b71159af3f6c9160b6315a7
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-24T04:57:44-08:00

Commit Message:
R2R: Don't allow character to teleport (bug #6546)

Changed paths:
    engines/tsage/ringworld2/ringworld2_logic.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 773425f..c5c6de9 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1432,7 +1432,7 @@ void SceneExit::process(Event &event) {
 	if (!R2_GLOBALS._insetUp) {
 		SceneArea::process(event);
 
-		if (_enabled) {
+		if (_enabled && R2_GLOBALS._player._enabled) {
 			if (event.eventType == EVENT_BUTTON_DOWN) {
 				if (!_bounds.contains(mousePos))
 					_moving = false;