* Some stuff with changing the Dink HD menu key to F1 from Shift-Escape

* Added Dan's .png loading patch (untested)

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1522 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth 2017-10-17 04:33:21 +00:00
parent 20f8a6a856
commit e0b2d2e5f0
17 changed files with 353 additions and 36 deletions

View file

@ -28,7 +28,7 @@ void KillVideoEngine()
void dderror(int hErr){};
IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType trans, IDirectDrawSurface::eMode mode, byte *pMem, bool bUseCheckerboardFix)
IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType trans, IDirectDrawSurface::eMode mode, byte *pMem, int pMemSize, bool bUseCheckerboardFix)
{
IDirectDrawSurface * pSurf;
@ -45,7 +45,7 @@ IDirectDrawSurface * LoadBitmapIntoSurface(const char *pName, eTransparencyType
//LogMsg("loading DDRAW bmp from mem");
#endif
//if this is set, ignore the filename
pSurf->m_pSurf->LoadFileFromMemory(pMem, SoftSurface::eColorKeyType(trans), 0, false, bUseCheckerboardFix);
pSurf->m_pSurf->LoadFileFromMemory(pMem, SoftSurface::eColorKeyType(trans), pMemSize, false, bUseCheckerboardFix);
} else
{
#ifdef _DEBUG