[Scummvm-cvs-logs] scummvm master -> 727ba4f2b1f20173e7a7f5ab6cb2910382785fe9

wjp wjp at usecode.org
Tue Feb 2 00:20:19 CET 2016


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:
727ba4f2b1 LAB: Fix loading rules from room 0


Commit: 727ba4f2b1f20173e7a7f5ab6cb2910382785fe9
    https://github.com/scummvm/scummvm/commit/727ba4f2b1f20173e7a7f5ab6cb2910382785fe9
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-02-02T00:18:34+01:00

Commit Message:
LAB: Fix loading rules from room 0

Regression from cd3ebf687c0e783147723095056d72684eddd347.

This fixes bug #6997.

Changed paths:
    engines/lab/processroom.cpp



diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index ecbfb4e..44c8d65 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -482,7 +482,7 @@ bool LabEngine::doActionRuleSub(int16 action, int16 roomNum, const CloseData *cl
 	if (closePtr) {
 		RuleList *rules = &(_rooms[_roomNum]._rules);
 
-		if (!rules && (roomNum == 0)) {
+		if (rules->empty() && (roomNum == 0)) {
 			_resource->readViews(roomNum);
 			rules = &(_rooms[roomNum]._rules);
 		}
@@ -530,7 +530,7 @@ bool LabEngine::doOperateRuleSub(int16 itemNum, int16 roomNum, const CloseData *
 		if (closePtr->_closeUpType > 0) {
 			RuleList *rules = &(_rooms[roomNum]._rules);
 
-			if (!rules && (roomNum == 0)) {
+			if (rules->empty() && (roomNum == 0)) {
 				_resource->readViews(roomNum);
 				rules = &(_rooms[roomNum]._rules);
 			}






More information about the Scummvm-git-logs mailing list