[Scummvm-cvs-logs] scummvm master -> fe916f17941ecb383d9f19c7fc046af3816cd73f

[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:
fe916f1794 ACCESS: Martian - Simplify check in takePicture()


Commit: fe916f17941ecb383d9f19c7fc046af3816cd73f
    https://github.com/scummvm/scummvm/commit/fe916f17941ecb383d9f19c7fc046af3816cd73f
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-27T02:05:40+01:00

Commit Message:
ACCESS: Martian - Simplify check in takePicture()

Changed paths:
    engines/access/room.cpp



diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index c91b37c..d0f1e59 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -111,8 +111,7 @@ void Room::takePicture() {
 			return;
 		}
 
-		// TODO: simplify the second part of the test when tested
-		if ((_vm->_scrollCol < 35) || ((_vm->_scrollRow >= 10) && (_vm->_scrollRow >= 20))){
+		if ((_vm->_scrollCol < 35) || (_vm->_scrollRow >= 20)){
 			Common::String msg = "THAT ISN'T INTERESTING ENOUGH TO WASTE FILM ON.";
 			_vm->_scripts->doCmdPrint_v1(msg);
 			return;