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

LAB: Reduce passing around of pointers to the near-global _closeDataPtr

Browse source
This commit is contained in:
Willem Jan Palenstijn 2015-12-26 14:18:44 +01:00
parent f72de724e9
commit 01d99d213d
6 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/lab/engine.cpp
View file

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