libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 01:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved newShape code to sequences_v3.cpp

Browse Source 
svn-id: r31752
This commit is contained in:
Johannes Schickel 2008-04-27 12:40:56 +00:00
parent 1aac349da4
commit 7eef01cec4
2 changed files with 76 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
engines/kyra/animator_v3.cpp
View File

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

76
engines/kyra/sequences_v3.cpp
View File

@ -169,6 +169,9 @@ void KyraEngine_v3::eelScript() {
objectChat((const char*)getTableEntry(_cCodeFile, 35), 0, 204, 35);
objectChat((const char*)getTableEntry(_cCodeFile, 40), 0, 204, 40);
setGameFlag(0xD1);
playSoundEffect(0x2A, 0xC8);
setGameFlag(0x171);
@ -200,5 +203,78 @@ void KyraEngine_v3::eelScript() {
_screen->showMouse();
}
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();
}
} // end of namespace Kyra