OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- replaced a large batch of DWORDs.

Browse source 
Most of those which still rely on ZDoom's own definition should be gone, unfortunately the code in files that include Windows headers is a gigantic mess with DWORDs being longs there intead of ints, so this needs to be done with care. DWORD should only remain where the Windows type is actually wanted.
This commit is contained in:
Christoph Oelckers 2017-03-09 20:19:55 +01:00
commit 9b87a167d7
38 changed files with 207 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/textures/texture.cpp
View file

@ -850,7 +850,7 @@ void FTexture::SetScaledSize(int fitwidth, int fitheight)
namespace
{
PalEntry averageColor(const DWORD *data, int size, int maxout)
PalEntry averageColor(const uint32_t *data, int size, int maxout)
{
int i;
unsigned int r, g, b;
@ -901,10 +901,10 @@ PalEntry FTexture::GetSkyCapColor(bool bottom)
const uint32_t *buffer = (const uint32_t *)bitmap.GetPixels();
if (buffer)
{
CeilingSkyColor = averageColor((DWORD *)buffer, w * MIN(30, h), 0);
CeilingSkyColor = averageColor((uint32_t *)buffer, w * MIN(30, h), 0);
if (h>30)
{
FloorSkyColor = averageColor(((DWORD *)buffer) + (h - 30)*w, w * 30, 0);
FloorSkyColor = averageColor(((uint32_t *)buffer) + (h - 30)*w, w * 30, 0);
}
else FloorSkyColor = CeilingSkyColor;
}