archives/DinkSmallwoodHD
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (DinkC) DinkC version is now reported as 110 instead of 109

Browse source 
* (Bugfix) Fixed issue with set_frame_frame, the DMOD Mayhem now works (is this DMOD for pyschopaths?!?! Not saying I didn't have fun though)
* (Bugfix) Fixed another incorrect color issue with fill_screen
* (Bugfix) Fixed horrible issue where the last line in a script might not get run.  This fixed the intro screen to Lost Forest Romp

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1486 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth 2017-09-17 04:54:34 +00:00
parent 04f68e8125
commit d8bb8b8c77
6 changed files with 125 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

25
source/video_gl.cpp
View file

@ -188,21 +188,28 @@ int IDirectDrawSurface::Blt( rtRect32 *pDestRect, IDirectDrawSurface * pSrcSurf,
assert(pDestRect == NULL && "Well, we only support modifying the entire screen");
//don't ask me why, but the original directx had these backwards. Palette is correct
if (pFX->dwFillColor == 0)
{
pFX->dwFillColor = 255;
}
else if (pFX->dwFillColor == 255)
{
pFX->dwFillColor = 0;
}
if (m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_RGB || m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_RGBA)
{
if (pFX->dwFillColor == 0)
{
pFX->dwFillColor = 255;
}
else if (pFX->dwFillColor == 255)
{
pFX->dwFillColor = 0;
}
m_pSurf->FillColor(g_palette.GetPalette()[pFX->dwFillColor]);
}
else
{
//sort of a hack for 8 bit index passing
glColorBytes palIndex(pFX->dwFillColor, 0, 0, 255);
m_pSurf->FillColor(palIndex);
}
m_pSurf->FillColor(g_palette.GetPalette()[pFX->dwFillColor]);
return DD_OK;
}
if (pSrcSurf && pSrcSurf->m_pSurf && pSrcSurf->m_pSurf->GetSurfaceType() != SoftSurface::SURFACE_NONE)