LAB: Fix loading rules from room 0

Regression from cd3ebf687c0e783147723095056d72684eddd347.

This fixes bug #6997.
This commit is contained in:
Willem Jan Palenstijn 2016-02-02 00:18:34 +01:00
parent d9b4f02d79
commit 727ba4f2b1

View File

@ -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);
}