[Scummvm-cvs-logs] SF.net SVN: scummvm: [29987] scummvm/trunk/engines/cruise
yazoo at users.sourceforge.net
yazoo at users.sourceforge.net
Tue Dec 25 19:36:08 CET 2007
Revision: 29987
http://scummvm.svn.sourceforge.net/scummvm/?rev=29987&view=rev
Author: yazoo
Date: 2007-12-25 10:36:08 -0800 (Tue, 25 Dec 2007)
Log Message:
-----------
Fix blinking character
Modified Paths:
--------------
scummvm/trunk/engines/cruise/background.cpp
scummvm/trunk/engines/cruise/backgroundIncrust.cpp
scummvm/trunk/engines/cruise/mainDraw.cpp
scummvm/trunk/engines/cruise/script.cpp
Modified: scummvm/trunk/engines/cruise/background.cpp
===================================================================
--- scummvm/trunk/engines/cruise/background.cpp 2007-12-25 18:11:35 UTC (rev 29986)
+++ scummvm/trunk/engines/cruise/background.cpp 2007-12-25 18:36:08 UTC (rev 29987)
@@ -145,10 +145,15 @@
ptr2 += 0x20;
flipGen(oldPalette, 0x20);
- for(unsigned long int i=0; i<32; i++)
- {
+ for(unsigned long int i=0; i<32; i++) {
gfxModuleData_convertOldPalColor(oldPalette[i], &palScreen[idx][i*3]);
}
+
+ // duplicate the palette
+ for(unsigned long int i=1; i<8; i++) {
+ memcpy(&palScreen[idx][32*i*3], &palScreen[idx][0], 32*3);
+ }
+
break;
}
case 5: // color on 4 bit
@@ -163,6 +168,12 @@
outPtr[0] = ((inPtr[0])&0x0F) * 17;
}
ptr2 += 2*32;
+
+ // duplicate the palette
+ for(unsigned long int i=1; i<8; i++) {
+ memcpy(&palScreen[idx][32*i*3], &palScreen[idx][0], 32*3);
+ }
+
break;
}
case 8:
Modified: scummvm/trunk/engines/cruise/backgroundIncrust.cpp
===================================================================
--- scummvm/trunk/engines/cruise/backgroundIncrust.cpp 2007-12-25 18:11:35 UTC (rev 29986)
+++ scummvm/trunk/engines/cruise/backgroundIncrust.cpp 2007-12-25 18:36:08 UTC (rev 29987)
@@ -177,7 +177,7 @@
int width = (sizeTable[1]+2) - (sizeTable[0]-2) + 1;
int height = sizeTable[3]-sizeTable[2]+1;
- backupBackground(newElement, newElement->X, newElement->Y, width, height, backgroundPtr);
+ backupBackground(newElement, sizeTable[0]-2, sizeTable[2], width, height, backgroundPtr);
}
addBackgroundIncrustSub1(params.fileIdx, newElement->X, newElement->Y, NULL, params.scale, (char *)backgroundPtr, (char *)filesDatabase[params.fileIdx].subData.ptr);
Modified: scummvm/trunk/engines/cruise/mainDraw.cpp
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.cpp 2007-12-25 18:11:35 UTC (rev 29986)
+++ scummvm/trunk/engines/cruise/mainDraw.cpp 2007-12-25 18:36:08 UTC (rev 29987)
@@ -239,8 +239,8 @@
SWAP(upperBorder, lowerBorder);
}
- sizeTable[0] = lowerBorder; // left
- sizeTable[1] = upperBorder; // right
+ sizeTable[0] = lowerBorder + positionX; // left
+ sizeTable[1] = upperBorder + positionX; // right
// Y1
@@ -259,8 +259,8 @@
SWAP(upperBorder, lowerBorder);
}
- sizeTable[2] = lowerBorder; // bottom
- sizeTable[3] = upperBorder; // top
+ sizeTable[2] = lowerBorder + positionY; // bottom
+ sizeTable[3] = upperBorder + positionY; // top
}
int nbseg;
Modified: scummvm/trunk/engines/cruise/script.cpp
===================================================================
--- scummvm/trunk/engines/cruise/script.cpp 2007-12-25 18:11:35 UTC (rev 29986)
+++ scummvm/trunk/engines/cruise/script.cpp 2007-12-25 18:36:08 UTC (rev 29987)
@@ -634,11 +634,6 @@
numScript2 = ptr->scriptNumber;
- if(ptr->overlayNumber == 66)
- {
- ptr->overlayNumber= ptr->overlayNumber;
- }
-
if (ptr->type == 20) {
ptr2 = getOvlData3Entry(ptr->overlayNumber, numScript2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list