diff options
author | Strangerke | 2015-12-19 12:46:57 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:35:30 +0100 |
commit | 7f5826cfcb72d1375d6c24b153a446fd9c92f623 (patch) | |
tree | d68da9cf0850c0a7e060ced8a883ba83d75eef33 | |
parent | 164b9d5a6674e3d8285a4277d2868030c4bb2cf1 (diff) | |
download | scummvm-rg350-7f5826cfcb72d1375d6c24b153a446fd9c92f623.tar.gz scummvm-rg350-7f5826cfcb72d1375d6c24b153a446fd9c92f623.tar.bz2 scummvm-rg350-7f5826cfcb72d1375d6c24b153a446fd9c92f623.zip |
LAB: Fix check of ending animation, some renaming
-rw-r--r-- | engines/lab/engine.cpp | 11 | ||||
-rw-r--r-- | engines/lab/processroom.cpp | 8 | ||||
-rw-r--r-- | engines/lab/processroom.h | 2 | ||||
-rw-r--r-- | engines/lab/resource.cpp | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index 81c401fcd7..52f8525b0d 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -113,11 +113,11 @@ static char initcolors[] = { '\x00', '\x00', '\x00', '\x30', '\x2c', '\x08', '\x08', '\x08' }; uint16 LabEngine::getQuarters() { - return _inventory[kItemQuarter]._many; + return _inventory[kItemQuarter]._quantity; } void LabEngine::setQuarters(uint16 quarters) { - _inventory[kItemQuarter]._many = quarters; + _inventory[kItemQuarter]._quantity = quarters; } /** @@ -134,8 +134,8 @@ void LabEngine::drawRoomMessage(uint16 curInv, CloseDataPtr closePtr) { if ((curInv == kItemLamp) && _conditions->in(kCondLampOn)) // LAB: Labyrinth specific drawStaticMessage(kTextkLampOn); - else if (_inventory[curInv]._many > 1) { - Common::String roomMessage = _inventory[curInv]._name + " (" + Common::String::format("%d", _inventory[curInv]._many) + ")"; + else if (_inventory[curInv]._quantity > 1) { + Common::String roomMessage = _inventory[curInv]._name + " (" + Common::String::format("%d", _inventory[curInv]._quantity) + ")"; _graphics->drawMessage(roomMessage.c_str()); } else _graphics->drawMessage(_inventory[curInv]._name.c_str()); @@ -593,8 +593,7 @@ void LabEngine::showLab2Teaser() { _graphics->readPict("P:End/L2In.9", true); _graphics->readPict("P:End/Lost", true); - warning("STUB: waitForPress"); - while (!1) { // 1 means ignore SDL_ProcessInput calls + while (!_event->getMsg() && !shouldQuit()) { _music->updateMusic(); _anim->diffNextFrame(); waitTOF(); diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index 2cec365af9..c7c3092067 100644 --- a/engines/lab/processroom.cpp +++ b/engines/lab/processroom.cpp @@ -396,16 +396,16 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { break; case SUBINV: - if (_inventory[actionList->_param1]._many) - (_inventory[actionList->_param1]._many)--; + if (_inventory[actionList->_param1]._quantity) + (_inventory[actionList->_param1]._quantity)--; - if (_inventory[actionList->_param1]._many == 0) + if (_inventory[actionList->_param1]._quantity == 0) _conditions->exclElement(actionList->_param1); break; case ADDINV: - (_inventory[actionList->_param1]._many) += actionList->_param2; + (_inventory[actionList->_param1]._quantity) += actionList->_param2; _conditions->inclElement(actionList->_param1); break; diff --git a/engines/lab/processroom.h b/engines/lab/processroom.h index cc08c8ad40..49e328b3ec 100644 --- a/engines/lab/processroom.h +++ b/engines/lab/processroom.h @@ -135,7 +135,7 @@ struct RoomData { }; struct InventoryData { - uint16 _many; + uint16 _quantity; Common::String _name; Common::String _bitmapName; }; diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp index b673072482..1b4bfd76a6 100644 --- a/engines/lab/resource.cpp +++ b/engines/lab/resource.cpp @@ -128,7 +128,7 @@ InventoryData *Resource::readInventory(const char *fileName) { InventoryData *inventory = new InventoryData[_vm->_numInv + 1]; for (uint16 i = 1; i <= _vm->_numInv; i++) { - inventory[i]._many = dataFile->readUint16LE(); + inventory[i]._quantity = dataFile->readUint16LE(); inventory[i]._name = readString(dataFile); inventory[i]._bitmapName = readString(dataFile); } |