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

Added a post processing step to runScripts, so that Animation can be validated after buggy scripts have been executed.

Browse Source 
svn-id: r33363
This commit is contained in:
Nicola Mettifogo 2008-07-28 08:56:37 +00:00
parent 16fe053ab4
commit c6cbf1f144
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engines/parallaction/exec_ns.cpp
View File

@ -331,35 +331,34 @@ void Parallaction_ns::drawAnimations() {
for (AnimationList::iterator it = _location._animations.begin(); it != _location._animations.end(); it++) {
AnimationPtr v18 = *it;
GfxObj *obj = v18->gfxobj;
AnimationPtr anim = *it;
GfxObj *obj = anim->gfxobj;
if ((v18->_flags & kFlagsActive) && ((v18->_flags & kFlagsRemove) == 0)) {
if ((anim->_flags & kFlagsActive) && ((anim->_flags & kFlagsRemove) == 0)) {
int16 frame = CLIP((int)v18->_frame, 0, v18->getFrameNum()-1);
if (v18->_flags & kFlagsNoMasked)
if (anim->_flags & kFlagsNoMasked)
layer = 3;
else
layer = _gfx->_backgroundInfo.getLayer(v18->_top + v18->height());
layer = _gfx->_backgroundInfo.getLayer(anim->_top + anim->height());
if (obj) {
_gfx->showGfxObj(obj, true);
obj->frame = frame;
obj->x = v18->_left;
obj->y = v18->_top;
obj->z = v18->_z;
obj->frame = anim->_frame;
obj->x = anim->_left;
obj->y = anim->_top;
obj->z = anim->_z;
obj->layer = layer;
}
}
if (((v18->_flags & kFlagsActive) == 0) && (v18->_flags & kFlagsRemove)) {
v18->_flags &= ~kFlagsRemove;
v18->_oldPos.x = -1000;
if (((anim->_flags & kFlagsActive) == 0) && (anim->_flags & kFlagsRemove)) {
anim->_flags &= ~kFlagsRemove;
anim->_oldPos.x = -1000;
}
if ((v18->_flags & kFlagsActive) && (v18->_flags & kFlagsRemove)) {
v18->_flags &= ~kFlagsActive;
v18->_flags |= kFlagsRemove;
if ((anim->_flags & kFlagsActive) && (anim->_flags & kFlagsRemove)) {
anim->_flags &= ~kFlagsActive;
anim->_flags |= kFlagsRemove;
if (obj) {
_gfx->showGfxObj(obj, false);
}
@ -416,6 +415,8 @@ void ProgramExec::runScripts(ProgramList::iterator first, ProgramList::iterator
label1:
if (a->_flags & kFlagsCharacter)
a->_z = a->_top + a->height();
a->validateScriptVars();
}
_modCounter++;

6
engines/parallaction/objects.cpp
View File

@ -81,6 +81,12 @@ byte* Animation::getFrameData(uint32 index) const {
return gfxobj->getData(index);
}
void Animation::validateScriptVars() {
// this is used to clip values of _frame, _left and _top
// which can be screwed up by buggy scripts.
_frame = CLIP(_frame, (int16)0, (int16)(getFrameNum() - 1));
}
#define NUM_LOCALS 10
char _localNames[NUM_LOCALS][10];

2
engines/parallaction/objects.h
View File

@ -448,6 +448,8 @@ struct Animation : public Zone {
virtual uint16 height() const;
uint16 getFrameNum() const;
byte* getFrameData(uint32 index) const;
void validateScriptVars();
};
class Table {