zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-17 17:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix an ICE when compiling with GCC 4.5.0.

Browse source 
SVN r2659 (trunk)
This commit is contained in:
Randy Heit 2010-09-01 03:22:43 +00:00
parent 230178bf98
commit 4b817cfd8b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/win32/st_start.cpp
View file

@ -656,23 +656,23 @@ FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr)
{ {
RGBQUAD color; RGBQUAD color;
DWORD quad; DWORD quad;
}; } c;
Wads.ReadLump (startup_lump, startup_screen); Wads.ReadLump (startup_lump, startup_screen);
color.rgbReserved = 0; c.color.rgbReserved = 0;
StartupBitmap = ST_Util_CreateBitmap (640, 480, 4); StartupBitmap = ST_Util_CreateBitmap (640, 480, 4);
// Initialize the bitmap palette. // Initialize the bitmap palette.
for (int i = 0; i < 16; ++i) for (int i = 0; i < 16; ++i)
{ {
color.rgbRed = startup_screen[i*3+0]; c.color.rgbRed = startup_screen[i*3+0];
color.rgbGreen = startup_screen[i*3+1]; c.color.rgbGreen = startup_screen[i*3+1];
color.rgbBlue = startup_screen[i*3+2]; c.color.rgbBlue = startup_screen[i*3+2];
// Convert from 6-bit per component to 8-bit per component. // Convert from 6-bit per component to 8-bit per component.
quad = (quad << 2) | ((quad >> 4) & 0x03030303); c.quad = (c.quad << 2) | ((c.quad >> 4) & 0x03030303);
StartupBitmap->bmiColors[i] = color; StartupBitmap->bmiColors[i] = c.color;
} }
// Fill in the bitmap data. Convert to chunky, because I can't figure out // Fill in the bitmap data. Convert to chunky, because I can't figure out