diff options
| author | Willem Jan Palenstijn | 2015-12-24 17:41:27 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-24 20:28:57 +0100 |
| commit | cd3ebf687c0e783147723095056d72684eddd347 (patch) | |
| tree | dd2ba40fa0145681aa3cebd67fc2ef3cdbd6a0aa /engines/lab/console.cpp | |
| parent | b614ccc2e8eca8e8159c9772669ee45909abdd81 (diff) | |
| download | scummvm-rg350-cd3ebf687c0e783147723095056d72684eddd347.tar.gz scummvm-rg350-cd3ebf687c0e783147723095056d72684eddd347.tar.bz2 scummvm-rg350-cd3ebf687c0e783147723095056d72684eddd347.zip | |
LAB: Avoid manual memory management of RuleList
Diffstat (limited to 'engines/lab/console.cpp')
| -rw-r--r-- | engines/lab/console.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lab/console.cpp b/engines/lab/console.cpp index 936f91f51c..31b52da0ba 100644 --- a/engines/lab/console.cpp +++ b/engines/lab/console.cpp @@ -60,7 +60,7 @@ bool Console::Cmd_DumpSceneResources(int argc, const char **argv) { int scene = atoi(argv[1]); _vm->_resource->readViews(scene); RoomData *roomData = &_vm->_rooms[scene]; - RuleList *rules = roomData->_rules; + RuleList &rules = roomData->_rules; const char *transitions[] = { "None", "Wipe", "ScrollWipe", "ScrollBlack", "ScrollBounce", "Transporter", "ReadFirstFrame", "ReadNextFrame" }; const char *ruleTypes[] = { "None", "Action", "Operate", "Go forward", "Conditions", "Turn", "Go main view", "Turn from to" }; const char *directions[] = { "", "North", "South", "East", "West" }; @@ -76,7 +76,7 @@ bool Console::Cmd_DumpSceneResources(int argc, const char **argv) { debugPrintf("Script:\n"); - for (RuleList::iterator rule = rules->begin(); rule != rules->end(); ++rule) { + for (RuleList::iterator rule = rules.begin(); rule != rules.end(); ++rule) { debugPrintf("Rule type: %s", ruleTypes[rule->_ruleType]); if (rule->_ruleType == kRuleTypeAction || rule->_ruleType == kRuleTypeOperate) debugPrintf(" (item %d, closeup %d)", rule->_param1, rule->_param2); @@ -109,7 +109,7 @@ bool Console::Cmd_FindAction(int argc, const char **argv) { for (int i = 1; i <= _vm->_manyRooms; i++) { _vm->_resource->readViews(i); - for (RuleList::iterator rule = _vm->_rooms[i]._rules->begin(); rule != _vm->_rooms[i]._rules->end(); ++rule) { + for (RuleList::iterator rule = _vm->_rooms[i]._rules.begin(); rule != _vm->_rooms[i]._rules.end(); ++rule) { Common::List<Action>::iterator action; for (action = rule->_actionList.begin(); action != rule->_actionList.end(); ++action) { if (action->_actionType == actionId && |