mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-06 02:46:49 +00:00
Completly fixed all the semi-transprency in Sam&Max
svn-id: r4034
This commit is contained in:
parent
abc4c2f34f
commit
25eafd60f2
@ -702,12 +702,6 @@ void CostumeRenderer::proc_special(Actor *a, byte mask2)
|
||||
byte shadow4;
|
||||
byte shadow5;
|
||||
|
||||
|
||||
if(a->costume==153) //Samnmax elevator FIXME
|
||||
|
||||
return;
|
||||
|
||||
|
||||
shadow1=a->shadow_mode & 0x80;
|
||||
shadow2=a->shadow_mode & 0x40;
|
||||
shadow3=a->shadow_mode & 0x20;
|
||||
|
46
gfx.cpp
46
gfx.cpp
@ -2640,19 +2640,25 @@ CHECK_HEAP;
|
||||
}
|
||||
|
||||
|
||||
/* Yazoo: This function create the specialPalette used for semi-transparency in SamnMax */
|
||||
|
||||
void Scumm::createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax)
|
||||
{
|
||||
byte *palPtr;
|
||||
byte *curPtr;
|
||||
byte *searchPtr;
|
||||
|
||||
byte colorComp1;
|
||||
byte colorComp2;
|
||||
byte colorComp3;
|
||||
byte readComp1;
|
||||
byte readComp2;
|
||||
byte readComp3;
|
||||
|
||||
byte searchComp1;
|
||||
byte searchComp2;
|
||||
byte searchComp3;
|
||||
int colorComp1;
|
||||
int colorComp2;
|
||||
int colorComp3;
|
||||
|
||||
int searchComp1;
|
||||
int searchComp2;
|
||||
int searchComp3;
|
||||
|
||||
short int bestResult;
|
||||
short int currentResult;
|
||||
@ -2664,28 +2670,27 @@ void Scumm::createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, in
|
||||
|
||||
palPtr = getPalettePtr();
|
||||
|
||||
for(i=colorMin;i<colorMax;i++)
|
||||
for(i=0;i<256;i++)
|
||||
_proc_special_palette[i]=i;
|
||||
|
||||
curPtr = palPtr + colorMin*3;
|
||||
|
||||
for(i=colorMin;i<colorMax;i++)
|
||||
{
|
||||
//colorComp1=((((*curPtr++)>>2)*c)>>8)&0x7F;
|
||||
//colorComp2=((((*curPtr++)>>2)*d)>>8)&0x7F;
|
||||
//colorComp3=((((*curPtr++)>>2)*e)>>8)&0x7F;
|
||||
readComp1=*(curPtr++);
|
||||
readComp2=*(curPtr++);
|
||||
readComp3=*(curPtr++);
|
||||
|
||||
/* Yazoo: I can't get the right formula, so I made one that just work fine with SamnMax flashlight */
|
||||
|
||||
colorComp1=(*curPtr++)+10;
|
||||
colorComp2=(*curPtr++)+10;
|
||||
colorComp3=(*curPtr++)+10;
|
||||
colorComp1=((readComp1)*c)>>8;
|
||||
colorComp2=((readComp2)*d)>>8;
|
||||
colorComp3=((readComp3)*e)>>8;
|
||||
|
||||
searchPtr = palPtr;
|
||||
bestResult = 0x7FFF;
|
||||
bestResult = 32000;
|
||||
currentIndex = 0;
|
||||
|
||||
for(j=0;j<256;j++)
|
||||
for(j=a;j<b;j++)
|
||||
{
|
||||
searchComp1 = (*searchPtr++);
|
||||
searchComp2 = (*searchPtr++);
|
||||
@ -2694,11 +2699,10 @@ void Scumm::createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, in
|
||||
currentResult = abs(searchComp1-colorComp1) + abs(searchComp2-colorComp2) + abs(searchComp3-colorComp3);
|
||||
|
||||
if(currentResult<bestResult)
|
||||
if(currentIndex >= a && currentIndex <= b)
|
||||
{
|
||||
_proc_special_palette[i]=currentIndex;
|
||||
bestResult=currentResult;
|
||||
}
|
||||
{
|
||||
_proc_special_palette[i]=currentIndex;
|
||||
bestResult=currentResult;
|
||||
}
|
||||
|
||||
currentIndex++;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user