From 7eef01cec48ac26d406a73a431120e56d919f63b Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 27 Apr 2008 12:40:56 +0000 Subject: Moved newShape code to sequences_v3.cpp svn-id: r31752 --- engines/kyra/animator_v3.cpp | 73 -------------------------------------------- 1 file changed, 73 deletions(-) (limited to 'engines/kyra/animator_v3.cpp') diff --git a/engines/kyra/animator_v3.cpp b/engines/kyra/animator_v3.cpp index 078b914e86..07a3713908 100644 --- a/engines/kyra/animator_v3.cpp +++ b/engines/kyra/animator_v3.cpp @@ -532,79 +532,6 @@ void KyraEngine_v3::showIdleAnim() { _nextIdleType = !_nextIdleType; } -int KyraEngine_v3::initNewShapes(uint8 *filedata) { - debugC(9, kDebugLevelAnimator, "KyraEngine_v3::initNewShapes(%p)", (const void*)filedata); - const int lastEntry = MIN(_newShapeLastEntry, 41); - for (int i = 0; i < lastEntry; ++i) - _gameShapes[9+i] = _screen->getPtrToShape(filedata, i); - return lastEntry; -} - -void KyraEngine_v3::processNewShapes(int allowSkip, int resetChar) { - debugC(9, kDebugLevelAnimator, "KyraEngine_v3::processNewShapes(%d, %d)", allowSkip, resetChar); - setCharacterAnimDim(_newShapeWidth, _newShapeHeight); - - _scriptInterpreter->initScript(&_temporaryScriptState, &_temporaryScriptData); - _scriptInterpreter->startScript(&_temporaryScriptState, 1); - - resetSkipFlag(); - - while (_scriptInterpreter->validScript(&_temporaryScriptState)) { - _temporaryScriptExecBit = false; - while (_scriptInterpreter->validScript(&_temporaryScriptState) && !_temporaryScriptExecBit) - _scriptInterpreter->runScript(&_temporaryScriptState); - - if (_newShapeAnimFrame < 0) - continue; - - _mainCharacter.animFrame = _newShapeAnimFrame + 9; - updateCharacterAnim(0); - if (_chatText) - updateWithText(); - else - update(); - - uint32 delayEnd = _system->getMillis() + _newShapeDelay * _tickLength; - - while ((!skipFlag() || !allowSkip) && _system->getMillis() < delayEnd) { - if (_chatText) - updateWithText(); - else - update(); - - delay(10); - } - - if (skipFlag()) - resetSkipFlag(); - } - - if (resetChar) { - if (_newShapeFlag >= 0) { - _mainCharacter.animFrame = _newShapeFlag + 9; - updateCharacterAnim(0); - if (_chatText) - updateWithText(); - else - update(); - } - - _mainCharacter.animFrame = _characterFrameTable[_mainCharacter.facing]; - updateCharacterAnim(0); - } - - _newShapeFlag = -1; - resetCharacterAnimDim(); -} - -void KyraEngine_v3::resetNewShapes(int count, uint8 *filedata) { - debugC(9, kDebugLevelAnimator, "KyraEngine_v3::resetNewShapes(%d, %p)", count, (const void*)filedata); - for (int i = 0; i < count; ++i) - _gameShapes[9+i] = 0; - delete [] filedata; - setNextIdleAnimTimer(); -} - void KyraEngine_v3::addItemToAnimList(int item) { debugC(9, kDebugLevelAnimator, "KyraEngine_v3::addItemToAnimList(%d)", item); restorePage3(); -- cgit v1.2.3