diff options
author | Strangerke | 2013-09-24 07:31:43 +0200 |
---|---|---|
committer | Strangerke | 2013-09-24 07:31:43 +0200 |
commit | f4e37939c7cb36041b610d8a8d42576959b94ed9 (patch) | |
tree | c4a03defd9e34dfa97b0f9948b78fc2416a9c743 /engines/avalanche/avalanche.cpp | |
parent | cbe9c151aa305e929527a1dd81d34e7c818ae128 (diff) | |
download | scummvm-rg350-f4e37939c7cb36041b610d8a8d42576959b94ed9.tar.gz scummvm-rg350-f4e37939c7cb36041b610d8a8d42576959b94ed9.tar.bz2 scummvm-rg350-f4e37939c7cb36041b610d8a8d42576959b94ed9.zip |
AVALANCHE: Move 2 enums out of Avalot classes, set private some parser variables
Diffstat (limited to 'engines/avalanche/avalanche.cpp')
-rw-r--r-- | engines/avalanche/avalanche.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index b8f06bf134..b0db9648a8 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -126,8 +126,6 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) { _saveNum++; sz.syncAsByte(_saveNum); sz.syncBytes(_avalot->_roomCount, 100); - sz.syncAsByte(_parser->_alcoholLevel); - sz.syncAsByte(_parser->_playedNim); sz.syncAsByte(_avalot->_wonNim); sz.syncAsByte(_avalot->_wineState); sz.syncAsByte(_avalot->_cwytalotGone); @@ -135,7 +133,6 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) { sz.syncAsByte(_avalot->_aylesIsAwake); sz.syncAsByte(_avalot->_drawbridgeOpen); sz.syncAsByte(_avalot->_avariciusTalk); - sz.syncAsByte(_parser->_boughtOnion); sz.syncAsByte(_avalot->_rottenOnion); sz.syncAsByte(_avalot->_onionInVinegar); sz.syncAsByte(_avalot->_givenToSpludwick); @@ -422,7 +419,7 @@ bool AvalancheEngine::loadGame(const int16 slot) { _background->forgetBackgroundSprites(); _avalot->minorRedraw(); _menu->setup(); - _avalot->_whereIs[Avalot::kPeopleAvalot - 150] = _avalot->_room; + _avalot->_whereIs[kPeopleAvalot - 150] = _avalot->_room; _avalot->_alive = true; _avalot->refreshObjectList(); _animation->updateSpeed(); |