diff options
author | Martin Kiewitz | 2010-08-11 12:01:56 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-08-11 12:01:56 +0000 |
commit | ab35ae03c3bd4c34933385658aeffb37053a178a (patch) | |
tree | b353cb6e470b0821de1f44db6abd0fe8a941f0db | |
parent | c70f16c55dbe1550ad6f6c850b06bc1239d48408 (diff) | |
download | scummvm-rg350-ab35ae03c3bd4c34933385658aeffb37053a178a.tar.gz scummvm-rg350-ab35ae03c3bd4c34933385658aeffb37053a178a.tar.bz2 scummvm-rg350-ab35ae03c3bd4c34933385658aeffb37053a178a.zip |
SCI: kAddToPic only wrote nsRect in sci1.1
fixes regression of r51952 and bug #3042957
svn-id: r51971
-rw-r--r-- | engines/sci/graphics/animate.cpp | 8 | ||||
-rw-r--r-- | engines/sci/graphics/animate.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp index ebfec34e4e..6f5a7ceac4 100644 --- a/engines/sci/graphics/animate.cpp +++ b/engines/sci/graphics/animate.cpp @@ -190,7 +190,7 @@ void GfxAnimate::makeSortedList(List *list) { Common::sort(_list.begin(), _list.end(), sortHelper); } -void GfxAnimate::fill(byte &old_picNotValid) { +void GfxAnimate::fill(byte &old_picNotValid, bool maySetNsRect) { reg_t curObject; uint16 signal; GfxView *view = NULL; @@ -254,7 +254,7 @@ void GfxAnimate::fill(byte &old_picNotValid) { it->scaleY = it->scaleX = 128; } - bool setNsRect = true; + bool setNsRect = maySetNsRect; // Create rect according to coordinates and given cel if (it->scaleSignal & kScaleSignalDoScaling) { @@ -615,7 +615,7 @@ void GfxAnimate::kernelAnimate(reg_t listReference, bool cycle, int argc, reg_t disposeLastCast(); makeSortedList(list); - fill(old_picNotValid); + fill(old_picNotValid, true); if (old_picNotValid) { // beginUpdate()/endUpdate() were introduced SCI1. @@ -700,7 +700,7 @@ void GfxAnimate::kernelAddToPicList(reg_t listReference, int argc, reg_t *argv) makeSortedList(list); preprocessAddToPicList(); - fill(tempPicNotValid); + fill(tempPicNotValid, getSciVersion() >= SCI_VERSION_1_1 ? true : false); addToPicDrawCels(); addToPicSetPicNotValid(); diff --git a/engines/sci/graphics/animate.h b/engines/sci/graphics/animate.h index c0d99a7ff5..4739eb0d31 100644 --- a/engines/sci/graphics/animate.h +++ b/engines/sci/graphics/animate.h @@ -94,7 +94,7 @@ public: void disposeLastCast(); bool invoke(List *list, int argc, reg_t *argv); void makeSortedList(List *list); - void fill(byte &oldPicNotValid); + void fill(byte &oldPicNotValid, bool maySetNsRect); void update(); void drawCels(); void updateScreen(byte oldPicNotValid); |