[Scummvm-cvs-logs] CVS: scummvm/kyra screen.cpp,1.38,1.39 screen.h,1.24,1.25 script_v1.cpp,1.67,1.68 wsamovie.cpp,1.20,1.21
Johannes Schickel
lordhoto at users.sourceforge.net
Sat Jan 14 07:21:05 CET 2006
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21930
Modified Files:
screen.cpp screen.h script_v1.cpp wsamovie.cpp
Log Message:
Fixed bug # 1401236. (KYRA: Erroneous animation in the pantheon of moonlight).
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/screen.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- screen.cpp 13 Jan 2006 03:27:01 -0000 1.38
+++ screen.cpp 14 Jan 2006 15:20:00 -0000 1.39
@@ -1307,8 +1307,8 @@
}
}
-void Screen::decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch) {
- debug(9, "Screen::decodeFrameDeltaPage(0x%X, 0x%X, %d)", dst, src, pitch);
+void Screen::decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch, int noXor) {
+ debug(9, "Screen::decodeFrameDeltaPage(0x%X, 0x%X, %d, %d)", dst, src, pitch, noXor);
int count = 0;
uint8 *dstNext = dst;
while (1) {
@@ -1317,7 +1317,11 @@
uint8 len = *src++;
code = *src++;
while (len--) {
- *dst++ ^= code;
+ if (noXor) {
+ *dst++ = code;
+ } else {
+ *dst++ ^= code;
+ }
if (++count == pitch) {
count = 0;
dstNext += SCREEN_W;
@@ -1335,7 +1339,6 @@
dstNext += SCREEN_W;
dst = dstNext + count;
}
-
} else {
uint16 subcode = READ_LE_UINT16(src); src += 2;
if (subcode == 0) {
@@ -1346,7 +1349,11 @@
uint16 len = subcode - 0x4000;
code = *src++;
while (len--) {
- *dst++ ^= code;
+ if (noXor) {
+ *dst++ = code;
+ } else {
+ *dst++ ^= code;
+ }
if (++count == pitch) {
count = 0;
dstNext += SCREEN_W;
@@ -1355,7 +1362,11 @@
}
} else {
while (subcode--) {
- *dst++ ^= *src++;
+ if (noXor) {
+ *dst++ = *src++;
+ } else {
+ *dst++ ^= *src++;
+ }
if (++count == pitch) {
count = 0;
dstNext += SCREEN_W;
@@ -1377,7 +1388,11 @@
}
} else {
while (code--) {
- *dst++ ^= *src++;
+ if (noXor) {
+ *dst++ = *src++;
+ } else {
+ *dst++ ^= *src++;
+ }
if (++count == pitch) {
count = 0;
dstNext += SCREEN_W;
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/screen.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- screen.h 13 Jan 2006 03:27:01 -0000 1.24
+++ screen.h 14 Jan 2006 15:20:00 -0000 1.25
@@ -125,7 +125,7 @@
static void decodeFrame3(const uint8 *src, uint8 *dst, uint32 size);
static void decodeFrame4(const uint8 *src, uint8 *dst, uint32 dstSize);
static void decodeFrameDelta(uint8 *dst, const uint8 *src);
- static void decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch);
+ static void decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch, int noXor);
uint8 *encodeShape(int x, int y, int w, int h, int flags);
void copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *dest);
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- script_v1.cpp 13 Jan 2006 23:06:04 -0000 1.67
+++ script_v1.cpp 14 Jan 2006 15:20:00 -0000 1.68
@@ -411,12 +411,12 @@
}
int KyraEngine::cmd_openWSAFile(ScriptState *script) {
- debug(3, "cmd_openWSAFile(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1));
+ debug(3, "cmd_openWSAFile(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2));
char *filename = stackPosString(0);
int wsaIndex = stackPos(1);
- _movieObjects[wsaIndex]->open(filename, 1, 0);
+ _movieObjects[wsaIndex]->open(filename, (stackPos(2) != 0) ? 1 : 0, 0);
assert(_movieObjects[wsaIndex]->opened());
return 0;
Index: wsamovie.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/wsamovie.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- wsamovie.cpp 11 Jan 2006 13:53:16 -0000 1.20
+++ wsamovie.cpp 14 Jan 2006 15:20:00 -0000 1.21
@@ -132,13 +132,11 @@
}
if (_currentFrame == _numFrames) {
- if (!(_flags & WF_OFFSCREEN_DECODE) && (_vm->features() & GF_TALKIE))
- _vm->screen()->clearPage(_drawPage);
if (!(_flags & WF_NO_FIRST_FRAME)) {
if (_flags & WF_OFFSCREEN_DECODE) {
Screen::decodeFrameDelta(dst, _deltaBuffer);
} else {
- Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width);
+ Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width, 1);
}
}
_currentFrame = 0;
@@ -201,7 +199,7 @@
if (_flags & WF_OFFSCREEN_DECODE) {
Screen::decodeFrameDelta(dst, _deltaBuffer);
} else {
- Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width);
+ Screen::decodeFrameDeltaPage(dst, _deltaBuffer, _width, 0);
}
}
} // end of namespace Kyra
More information about the Scummvm-git-logs
mailing list