diff options
| author | Willem Jan Palenstijn | 2015-12-26 14:18:44 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-26 14:18:44 +0100 |
| commit | 01d99d213dae8731c3c9a19cbd98f5fbfb9ee1fc (patch) | |
| tree | fd8833447d6d6ccf5c05e8a2977e03e661ab9802 /engines/lab/engine.cpp | |
| parent | f72de724e90aa9f79cc08a029c508559dde383ae (diff) | |
| download | scummvm-rg350-01d99d213dae8731c3c9a19cbd98f5fbfb9ee1fc.tar.gz scummvm-rg350-01d99d213dae8731c3c9a19cbd98f5fbfb9ee1fc.tar.bz2 scummvm-rg350-01d99d213dae8731c3c9a19cbd98f5fbfb9ee1fc.zip | |
LAB: Reduce passing around of pointers to the near-global _closeDataPtr
Diffstat (limited to 'engines/lab/engine.cpp')
| -rw-r--r-- | engines/lab/engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index 8c95f9631f..34db2c5a92 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -425,7 +425,7 @@ void LabEngine::mainGameLoop() { // Sets the current picture properly on the screen if (_mainDisplay) - _nextFileName = getPictName(&_closeDataPtr); + _nextFileName = getPictName(true); if (_noUpdateDiff) { // Potentially entered another room @@ -954,7 +954,7 @@ void LabEngine::performAction(uint16 actionMode, Common::Point curPos, uint16 &c // Take something. if (doActionRule(curPos, actionMode, _roomNum)) _curFileName = _newFileName; - else if (takeItem(curPos, &_closeDataPtr)) + else if (takeItem(curPos)) drawStaticMessage(kTextTakeItem); else if (doActionRule(curPos, kRuleActionTakeDef, _roomNum)) _curFileName = _newFileName; |