libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source 
svn-id: r31674
This commit is contained in:
Johannes Schickel 2008-04-23 19:36:21 +00:00
parent 69bdd29976
commit c841481aa3
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/kyra/kyra_v2.cpp
View File

@ -1250,7 +1250,7 @@ void KyraEngine_v2::loadNPCScript() {
_scriptInterpreter->loadScript(filename, &_npcScriptData, &_opcodes);
}
void KyraEngine_v2::runTemporaryScript(const char *filename, int unk1, int unk2, int newShapes, int shapeUnload) {
void KyraEngine_v2::runTemporaryScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload) {
memset(&_temporaryScriptData, 0, sizeof(_temporaryScriptData));
memset(&_temporaryScriptState, 0, sizeof(_temporaryScriptState));
@ -1262,19 +1262,19 @@ void KyraEngine_v2::runTemporaryScript(const char *filename, int unk1, int unk2,
_newShapeFlag = -1;
if (_newShapeFiledata && newShapes) {
resetNewShapes(_newShapeCount, _newShapeFiledata);
_newShapeFiledata = 0;
_newShapeCount = 0;
}
while (_scriptInterpreter->validScript(&_temporaryScriptState))
_scriptInterpreter->runScript(&_temporaryScriptState);
uint8 *fileData = 0;
if (newShapes) {
if (_newShapeFiledata) {
resetNewShapes(_newShapeCount, _newShapeFiledata);
_newShapeFiledata = 0;
_newShapeCount = 0;
}
if (newShapes)
_newShapeFiledata = _res->fileData(_newShapeFilename, 0);
}
fileData = _newShapeFiledata;
@ -1286,7 +1286,7 @@ void KyraEngine_v2::runTemporaryScript(const char *filename, int unk1, int unk2,
if (newShapes)
_newShapeCount = initNewShapes(fileData);
processNewShapes(unk1, unk2);
processNewShapes(allowSkip, resetChar);
if (shapeUnload) {
resetNewShapes(_newShapeCount, fileData);
@ -1639,7 +1639,7 @@ int KyraEngine_v2::initNewShapes(uint8 *filedata) {
return lastEntry;
}
void KyraEngine_v2::processNewShapes(int unk1, int unk2) {
void KyraEngine_v2::processNewShapes(int allowSkip, int resetChar) {
setCharacterAnimDim(_newShapeWidth, _newShapeHeight);
_scriptInterpreter->initScript(&_temporaryScriptState, &_temporaryScriptData);
@ -1664,7 +1664,7 @@ void KyraEngine_v2::processNewShapes(int unk1, int unk2) {
uint32 delayEnd = _system->getMillis() + _newShapeDelay * _tickLength;
while ((!skipFlag() || !unk1) && _system->getMillis() < delayEnd) {
while ((!skipFlag() || !allowSkip) && _system->getMillis() < delayEnd) {
if (_chatText)
updateWithText();
else
@ -1677,7 +1677,7 @@ void KyraEngine_v2::processNewShapes(int unk1, int unk2) {
resetSkipFlag();
}
if (unk2) {
if (resetChar) {
if (_newShapeFlag >= 0) {
_mainCharacter.animFrame = _newShapeFlag + 33;
updateCharacterAnim(0);

4
engines/kyra/kyra_v2.h
View File

@ -446,7 +446,7 @@ protected:
int _newShapeDelay;
int initNewShapes(uint8 *filedata);
void processNewShapes(int unk1, int unk2);
void processNewShapes(int allowSkip, int resetChar);
void resetNewShapes(int count, uint8 *filedata);
// animator
@ -1070,7 +1070,7 @@ protected:
bool _temporaryScriptExecBit;
Common::Array<const Opcode*> _opcodesTemporary;
void runTemporaryScript(const char *filename, int unk1, int unk2, int newShapes, int shapeUnload);
void runTemporaryScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload);
// pathfinder
int _pathfinderFlag;

14
engines/kyra/kyra_v3.cpp
View File

@ -1569,19 +1569,19 @@ void KyraEngine_v3::runTemporaryScript(const char *filename, int allowSkip, int
_newShapeFlag = -1;
if (_newShapeFiledata && newShapes) {
resetNewShapes(_newShapeCount, _newShapeFiledata);
_newShapeFiledata = 0;
_newShapeCount = 0;
}
while (_scriptInterpreter->validScript(&_temporaryScriptState))
_scriptInterpreter->runScript(&_temporaryScriptState);
uint8 *fileData = 0;
if (newShapes) {
if (_newShapeFiledata) {
resetNewShapes(_newShapeCount, _newShapeFiledata);
_newShapeFiledata = 0;
_newShapeCount = 0;
}
if (newShapes)
_newShapeFiledata = _res->fileData(_newShapeFilename, 0);
}
fileData = _newShapeFiledata;