libretro/libretro-wolfenstein3d
1
0
Fork 0
mirror of https://github.com/libretro/libretro-wolfenstein3d.git synced 2025-02-21 09:20:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove curPitch

Browse Source
This commit is contained in:
twinaphex 2016-03-21 00:49:13 +01:00
parent 8b2d6edd34
commit dc0c7cea2c
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
id_ca.c
View File

@ -1024,7 +1024,7 @@ void CA_CacheScreen (int chunk)
byte col = pic[(y * 80 + (x >> 2)) + (x & 3) * 80 * 200];
for(i = 0; i < scaleFactor; i++)
for(j = 0; j < scaleFactor; j++)
vbuf[(scy + i) * curPitch + scx + j] = col;
vbuf[(scy + i) * bufferPitch + scx + j] = col;
}
}
VL_UnlockSurface(screenBuffer);

4
id_libretro.c
View File

@ -47,10 +47,8 @@ void VL_Startup (void)
screenPitch = screen->surf->pitch;
bufferPitch = screenBuffer->surf->pitch;
curPitch = bufferPitch;
scaleFactor = screenWidth/320;
if(screenHeight/200 < scaleFactor)
scaleFactor = screenHeight/200;

4
id_vh.c
View File

@ -16,7 +16,7 @@ void VWB_DrawPropString(const char* string)
byte *vbuf = VL_LockSurface(screenBuffer);
fontstruct *font = (fontstruct *) grsegs[STARTFONT+fontnumber];
int height = font->height;
byte *dest = vbuf + scaleFactor * (py * curPitch + px);
byte *dest = vbuf + scaleFactor * (py * bufferPitch + px);
while ((ch = (byte)*string++) != 0)
{
@ -31,7 +31,7 @@ void VWB_DrawPropString(const char* string)
{
for(sy=0; sy<scaleFactor; sy++)
for(sx=0; sx<scaleFactor; sx++)
dest[(scaleFactor*i+sy)*curPitch+sx]=fontcolor;
dest[(scaleFactor*i+sy) * bufferPitch + sx]=fontcolor;
}
}

22
id_vl.c
View File

@ -15,8 +15,6 @@ unsigned screenPitch;
LR_Surface *screenBuffer = NULL;
unsigned bufferPitch;
unsigned curPitch;
unsigned scaleFactor;
boolean screenfaded;
@ -183,7 +181,7 @@ void VL_Plot (int x, int y, int color)
&& "VL_Plot: Pixel out of bounds!");
VL_LockSurface(screenBuffer);
((byte *) screenBuffer->surf->pixels)[y * curPitch + x] = color;
((byte *) screenBuffer->surf->pixels)[y * bufferPitch + x] = color;
VL_UnlockSurface(screenBuffer);
}
@ -203,7 +201,7 @@ byte VL_GetPixel (int x, int y)
&& "VL_GetPixel: Pixel out of bounds!");
VL_LockSurface(screenBuffer);
col = ((byte *) screenBuffer->surf->pixels)[y * curPitch + x];
col = ((byte *) screenBuffer->surf->pixels)[y * bufferPitch + x];
VL_UnlockSurface(screenBuffer);
return col;
}
@ -226,7 +224,7 @@ void VL_Hlin (unsigned x, unsigned y, unsigned width, int color)
&& "VL_Hlin: Destination rectangle out of bounds!");
VL_LockSurface(screenBuffer);
dest = ((byte *) screenBuffer->surf->pixels) + y * curPitch + x;
dest = ((byte *) screenBuffer->surf->pixels) + y * bufferPitch + x;
memset(dest, color, width);
VL_UnlockSurface(screenBuffer);
}
@ -249,12 +247,12 @@ void VL_Vlin (int x, int y, int height, int color)
&& "VL_Vlin: Destination rectangle out of bounds!");
VL_LockSurface(screenBuffer);
dest = ((byte *) screenBuffer->surf->pixels) + y * curPitch + x;
dest = ((byte *) screenBuffer->surf->pixels) + y * bufferPitch + x;
while (height--)
{
*dest = color;
dest += curPitch;
dest += bufferPitch;
}
VL_UnlockSurface(screenBuffer);
}
@ -277,12 +275,12 @@ void VL_BarScaledCoord (int scx, int scy, int scwidth, int scheight, int color)
&& "VL_BarScaledCoord: Destination rectangle out of bounds!");
VL_LockSurface(screenBuffer);
dest = ((byte *) screenBuffer->surf->pixels) + scy * curPitch + scx;
dest = ((byte *) screenBuffer->surf->pixels) + scy * bufferPitch + scx;
while (scheight--)
{
memset(dest, color, scwidth);
dest += curPitch;
dest += bufferPitch;
}
VL_UnlockSurface(screenBuffer);
}
@ -358,7 +356,7 @@ void VL_MemToScreenScaledCoord (byte *source, int width, int height, int destx,
for(m = 0; m < scaleFactor; m++)
{
for(n = 0; n < scaleFactor; n++)
vbuf[(scj+m+desty)*curPitch+sci+n+destx] = col;
vbuf[(scj+m+desty) * bufferPitch + sci+n+destx] = col;
}
}
}
@ -399,7 +397,7 @@ void VL_MemToScreenScaledCoord2 (byte *source, int origwidth, int origheight, in
for(m = 0; m < scaleFactor; m++)
{
for(n = 0; n < scaleFactor; n++)
vbuf[(scj+m+desty)*curPitch+sci+n+destx] = col;
vbuf[(scj+m+desty)* bufferPitch + sci+n+destx] = col;
}
}
}
@ -440,7 +438,7 @@ void VL_LatchToScreenScaledCoord(LR_Surface *source, int xsrc, int ysrc,
for(m = 0; m < scaleFactor; m++)
{
for(n = 0; n < scaleFactor; n++)
vbuf[(scydest+scj+m)*curPitch+scxdest+sci+n] = col;
vbuf[(scydest+scj+m)* bufferPitch + scxdest+sci+n] = col;
}
}
}

2
id_vl.h
View File

@ -24,7 +24,7 @@ void Quit (const char *error,...);
extern LR_Surface *screen, *screenBuffer;
extern boolean fullscreen;
extern unsigned screenWidth, screenHeight, screenBits, screenPitch, bufferPitch, curPitch;
extern unsigned screenWidth, screenHeight, screenBits, screenPitch, bufferPitch;
extern unsigned scaleFactor;
extern boolean screenfaded;