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

lordhoto lordhoto at gmail.com
Sun Jan 15 14:18:10 CET 2012


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:
cdb6cf687f TSAGE: Don't use "&&" synonym "and".


Commit: cdb6cf687fbeb9365dc75dc5fc92ad17fea8f2e3
    https://github.com/scummvm/scummvm/commit/cdb6cf687fbeb9365dc75dc5fc92ad17fea8f2e3
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2012-01-15T05:12:45-08:00

Commit Message:
TSAGE: Don't use "&&" synonym "and".

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 45aec17..aa2a0d9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2237,7 +2237,7 @@ void Scene1550::UnkArea1550::remove() {
 	SceneArea::remove();
 	R2_GLOBALS._insetUp--;
 	//
-	if ((scene->_sceneMode >= 20) and (scene->_sceneMode <= 29))
+	if ((scene->_sceneMode >= 20) && (scene->_sceneMode <= 29))
 		return;
 	
 	R2_GLOBALS._player.disableControl();






More information about the Scummvm-git-logs mailing list