thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Change RuleList to a Common::List<Rule> as suggested by wjp

Browse source
This commit is contained in:
Strangerke 2015-12-22 18:51:37 +01:00 • committed by Willem Jan Palenstijn
parent f3db3ba305
commit 7380ddf400
3 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engines/lab/resource.cpp
View file

@ -264,12 +264,12 @@ RuleList *Resource::readRule(Common::File *file) {
c = file->readByte();
if (c == 1) {
Rule *rule = new Rule();
rule->_ruleType = file->readSint16LE();
rule->_param1 = file->readSint16LE();
rule->_param2 = file->readSint16LE();
rule->_condition = readConditions(file);
rule->_actionList = readAction(file);
Rule rule;
rule._ruleType = file->readSint16LE();
rule._param1 = file->readSint16LE();
rule._param2 = file->readSint16LE();
rule._condition = readConditions(file);
rule._actionList = readAction(file);
rules->push_back(rule);
}
} while (c == 1);
@ -282,9 +282,8 @@ void Resource::freeRule(RuleList *ruleList) {
return;
for (RuleList::iterator rule = ruleList->begin(); rule != ruleList->end(); ++rule) {
freeAction((*rule)->_actionList);
delete[](*rule)->_condition;
delete *rule;
freeAction(rule->_actionList);
delete[] rule->_condition;
}
delete ruleList;