a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed DrawWaterWithLight in Windows port. [kode54]

Browse Source
This commit is contained in:
stainless
2001-09-14 07:24:51 +00:00
parent ed4d7ea795
commit 25621af7ce
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
zsnes/src/water.c
View File

@@ -41,7 +41,7 @@ static int Height[2][SCRW*SCRH];
extern char NetPlayNoMore; extern char NetPlayNoMore;
static void DrawWaterNoLight(int *ptr); static void DrawWaterNoLight(int *ptr);
void DrawWaterWithLight(int *ptr,int light); static void DrawWaterWithLight(int *ptr,int light);
static void SineBlob(int x, int y, int radius, int height, int page); static void SineBlob(int x, int y, int radius, int height, int page);
static void CalcWater(int *nptr,int *optr,int density); static void CalcWater(int *nptr,int *optr,int density);
@@ -71,7 +71,7 @@ void DrawWater(void)
} }
*/ */
#ifdef __WIN32__ #if 0
DrawWaterNoLight(Height[Hpage]); DrawWaterNoLight(Height[Hpage]);
#else #else
DrawWaterWithLight(Height[Hpage],1); DrawWaterWithLight(Height[Hpage],1);
@@ -227,7 +227,6 @@ void DrawWaterNoLight(int *ptr)
} }
void DrawWaterWithLight(int *ptr,int light) void DrawWaterWithLight(int *ptr,int light)
{ {
int dx,dy; int dx,dy;
@@ -249,14 +248,21 @@ void DrawWaterWithLight(int *ptr,int light)
dy=ptr[offset]-ptr[offset+SCRW]; dy=ptr[offset]-ptr[offset+SCRW];
p=offset+SCRW*(dy>>3)+(dx>>3); p=offset+SCRW*(dy>>3)+(dx>>3);
if(p>(SCRH*SCRW)) if (p>(SCRH*SCRW)) p = (p % SCRW) + ((SCRH-((p - (SCRH*SCRW)) / SCRW)) * SCRW);
if (p<0) p = (SCRW + (p % SCRW)) + abs(p / SCRW) * SCRW;
/*
if(p >= (SCRW*SCRH) )
{ {
for(;p<(SCRH*SCRW);p-=SCRW); p=(SCRW*SCRH)-1;
} }
if(p<0) else
{ {
for(;p>=0;p+=SCRW); if(p < 0)
{
p=0;
} }
}
*/
c=vidbuffer[p]; c=vidbuffer[p];
c-=(dx>>light); c-=(dx>>light);
(c<1) ? c=1 : (c > 31) ? c=31 : 0; (c<1) ? c=1 : (c > 31) ? c=31 : 0;
@@ -265,14 +271,21 @@ void DrawWaterWithLight(int *ptr,int light)
dx=ptr[offset]-ptr[offset+1]; dx=ptr[offset]-ptr[offset+1];
dy=ptr[offset]-ptr[offset+SCRW]; dy=ptr[offset]-ptr[offset+SCRW];
p=offset+SCRW*(dy>>3)+(dx>>3); p=offset+SCRW*(dy>>3)+(dx>>3);
if(p>(SCRH*SCRW)) if (p>(SCRH*SCRW)) p = (p % SCRW) + ((SCRH-((p - (SCRH*SCRW)) / SCRW)) * SCRW);
if (p<0) p = (SCRW + (p % SCRW)) + abs(p / SCRW) * SCRW;
/*
if(p >= (SCRW*SCRH) )
{ {
for(;p<(SCRH*SCRW);p-=SCRW); p=(SCRW*SCRH)-1;
} }
if(p<0) else
{ {
for(;p>=0;p+=SCRW); if(p < 0)
{
p=0;
} }
}
*/
c=vidbuffer[p]; c=vidbuffer[p];
c-=(dx>>light); c-=(dx>>light);
@@ -288,7 +301,6 @@ void DrawWaterWithLight(int *ptr,int light)
} }
void CalcWater(int *nptr,int *optr,int density) void CalcWater(int *nptr,int *optr,int density)
{ {
int newh; int newh;
@@ -328,6 +340,9 @@ void SineBlob(int x, int y, int radius, int height, int page)
if(y<0) y = 1+radius+ rand()%(SCRH-2*radius-1); if(y<0) y = 1+radius+ rand()%(SCRH-2*radius-1);
// radsquare = (radius*radius) << 8;
radsquare = (radius*radius);
/* /*
if (NetPlayNoMore == 1) if (NetPlayNoMore == 1)
{ {
@@ -342,9 +357,7 @@ void SineBlob(int x, int y, int radius, int height, int page)
radsquare = (radius*radius); radsquare = (radius*radius);
#ifndef __WIN32__
height /= 8; height /= 8;
#endif
left=-radius; right = radius; left=-radius; right = radius;
top=-radius; bottom = radius; top=-radius; bottom = radius;