diff options
| author | Strangerke | 2015-12-18 10:34:09 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:34:09 +0100 |
| commit | 5c360b40215ce35acbb1a0f5d6bfe5b27d3561f8 (patch) | |
| tree | bcb15f42f8b435c08465f27e9abf97e4822842e0 | |
| parent | b3b3c0cfd565b66a77fdfa810845619dea362d95 (diff) | |
| download | scummvm-rg350-5c360b40215ce35acbb1a0f5d6bfe5b27d3561f8.tar.gz scummvm-rg350-5c360b40215ce35acbb1a0f5d6bfe5b27d3561f8.tar.bz2 scummvm-rg350-5c360b40215ce35acbb1a0f5d6bfe5b27d3561f8.zip | |
LAB: Remove dead code
| -rw-r--r-- | engines/lab/engine.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index d98f8b65f7..a229b68dd4 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -699,20 +699,16 @@ bool LabEngine::fromCrumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Commo } else if (msgClass == kMessageDeltaMove) { ViewData *vptr = getViewData(_roomNum, _direction); CloseDataPtr oldClosePtr = vptr->_closeUps; + CloseDataPtr tmpClosePtr = _closeDataPtr; + setCurrentClose(curPos, &tmpClosePtr, true); - if (!wrkClosePtr) { // CHECKME: Always true? - CloseDataPtr tmpClosePtr = _closeDataPtr; - setCurrentClose(curPos, &tmpClosePtr, true); - - if (!tmpClosePtr || (tmpClosePtr == _closeDataPtr)) { - if (!_closeDataPtr) - wrkClosePtr = oldClosePtr; - else - wrkClosePtr = _closeDataPtr->_subCloseUps; - } else - wrkClosePtr = tmpClosePtr->_nextCloseUp; + if (!tmpClosePtr || (tmpClosePtr == _closeDataPtr)) { + if (!_closeDataPtr) + wrkClosePtr = oldClosePtr; + else + wrkClosePtr = _closeDataPtr->_subCloseUps; } else - wrkClosePtr = wrkClosePtr->_nextCloseUp; + wrkClosePtr = tmpClosePtr->_nextCloseUp; if (!wrkClosePtr) { |