OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- except for DWORD, all homegrown integer types are gone - a handful were left where they represent genuine Windows types.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-09 19:54:41 +01:00
commit d2beacfc5f
136 changed files with 770 additions and 774 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/win32/fb_ddraw.cpp
View file

@ -163,7 +163,7 @@ DDrawFB::DDrawFB (int width, int height, bool fullscreen)
PalEntries[i].peRed = GPalette.BaseColors[i].r;
PalEntries[i].peGreen = GPalette.BaseColors[i].g;
PalEntries[i].peBlue = GPalette.BaseColors[i].b;
GammaTable[0][i] = GammaTable[1][i] = GammaTable[2][i] = (BYTE)i;
GammaTable[0][i] = GammaTable[1][i] = GammaTable[2][i] = (uint8_t)i;
}
memcpy (SourcePalette, GPalette.BaseColors, sizeof(PalEntry)*256);
@ -781,7 +781,7 @@ void DDrawFB::RebuildColorTable ()
}
for (i = 0; i < 256; i++)
{
GPfxPal.Pal8[i] = (BYTE)BestColor ((uint32_t *)syspal, PalEntries[i].peRed,
GPfxPal.Pal8[i] = (uint8_t)BestColor ((uint32_t *)syspal, PalEntries[i].peRed,
PalEntries[i].peGreen, PalEntries[i].peBlue);
}
}
@ -996,7 +996,7 @@ DDrawFB::LockSurfRes DDrawFB::LockSurf (LPRECT lockrect, LPDIRECTDRAWSURFACE toL
LOG1 ("Final result after restoration attempts: %08lx\n", hr);
return NoGood;
}
Buffer = (BYTE *)desc.lpSurface;
Buffer = (uint8_t *)desc.lpSurface;
Pitch = desc.lPitch;
BufferingNow = false;
return wasLost ? GoodWasLost : Good;
@ -1132,7 +1132,7 @@ void DDrawFB::Update ()
{
if (LockSurf (NULL, NULL) != NoGood)
{
BYTE *writept = Buffer + (TrueHeight - Height)/2*Pitch;
uint8_t *writept = Buffer + (TrueHeight - Height)/2*Pitch;
LOG3 ("Copy %dx%d (%d)\n", Width, Height, BufferPitch);
if (UsePfx)
{