diff options
| author | Willem Jan Palenstijn | 2016-02-02 00:18:34 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2016-02-02 00:18:34 +0100 |
| commit | 727ba4f2b1f20173e7a7f5ab6cb2910382785fe9 (patch) | |
| tree | 50b5cbb43f801a42005aeb7b137b1034e02027fd /engines/lab | |
| parent | d9b4f02d79f1231cbb890537d1d3db5223bf8d29 (diff) | |
| download | scummvm-rg350-727ba4f2b1f20173e7a7f5ab6cb2910382785fe9.tar.gz scummvm-rg350-727ba4f2b1f20173e7a7f5ab6cb2910382785fe9.tar.bz2 scummvm-rg350-727ba4f2b1f20173e7a7f5ab6cb2910382785fe9.zip | |
LAB: Fix loading rules from room 0
Regression from cd3ebf687c0e783147723095056d72684eddd347.
This fixes bug #6997.
Diffstat (limited to 'engines/lab')
| -rw-r--r-- | engines/lab/processroom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index ecbfb4e2a7..44c8d65d7c 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); } |