diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/saga/gfx.cpp | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/saga/gfx.cpp')
-rw-r--r-- | engines/saga/gfx.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp index a9c6801714..56ffe04c96 100644 --- a/engines/saga/gfx.cpp +++ b/engines/saga/gfx.cpp @@ -130,10 +130,7 @@ void Surface::drawPolyLine(const Point *points, int count, int color) { } } -/** -* Dissolve one image with another. -* If flags if set to 1, do zero masking. -*/ +// Dissolve one image with another. If flags is set to 1, do zero masking. void Surface::transitionDissolve(const byte *sourceBuffer, const Common::Rect &sourceRect, int flags, double percent) { #define XOR_MASK 0xB400; int pixelcount = w * h; @@ -431,7 +428,10 @@ void Gfx::setCursor(CursorType cursorType) { switch (cursorType) { case kCursorBusy: - resourceId = RID_IHNM_HOURGLASS_CURSOR; + if (_vm->getGameId() != GID_IHNM_DEMO) + resourceId = RID_IHNM_HOURGLASS_CURSOR; + else + resourceId = (uint32)-1; break; default: resourceId = (uint32)-1; |