libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix blinking character

Browse Source 
svn-id: r29987
This commit is contained in:
Vincent Hamm 2007-12-25 18:36:08 +00:00
parent a2d2f01835
commit 7159cc26df
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/cruise/background.cpp
View File

@ -145,10 +145,15 @@ int loadBackground(const char *name, int idx) {
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 @@ int loadBackground(const char *name, int idx) {
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:

2
engines/cruise/backgroundIncrust.cpp
View File

@ -177,7 +177,7 @@ backgroundIncrustStruct *addBackgroundIncrust(int16 overlayIdx, int16 objectIdx,
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);

8
engines/cruise/mainDraw.cpp
View File

@ -239,8 +239,8 @@ void getPolySize(int positionX, int positionY, int scale, int sizeTable[4], unsi
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 @@ void getPolySize(int positionX, int positionY, int scale, int sizeTable[4], unsi
SWAP(upperBorder, lowerBorder);
}
sizeTable[2] = lowerBorder; // bottom
sizeTable[3] = upperBorder; // top
sizeTable[2] = lowerBorder + positionY; // bottom
sizeTable[3] = upperBorder + positionY; // top
}
int nbseg;

5
engines/cruise/script.cpp
View File

@ -634,11 +634,6 @@ int executeScripts(scriptInstanceStruct *ptr) {
numScript2 = ptr->scriptNumber;
if(ptr->overlayNumber == 66)
{
ptr->overlayNumber= ptr->overlayNumber;
}
if (ptr->type == 20) {
ptr2 = getOvlData3Entry(ptr->overlayNumber, numScript2);