mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
Fixes (by The_Bob):
- Fixed random freeze on win8/10 - Fixed crash on mercs entering sector - Fixed crash when using cover display (del/end) - Fixed attachment popup showing incompatible attachments (crash/freeze/confusion on clicking the option) - Fixed attachment popup positioning - Fixed LBE contents corruption/deletion - Fixed access violation (out of array bounds) in interrupt code - Fixed a bunch of random old stuff - Got the project to build on VS2015 - Improved popup class handling of grayed out options - Improved performance of get item assignment check (added by Flugente) - Added Ctrl+Space bind for testing/fixing broken LBE contents git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1182,22 +1182,29 @@ void SaveVideoOverlaysArea( UINT32 uiSrcBuffer )
|
||||
{
|
||||
if( gVideoOverlays[uiCount].fAllocated && !gVideoOverlays[uiCount].fDisabled )
|
||||
{
|
||||
iBackIndex = gVideoOverlays[uiCount].uiBackground;
|
||||
|
||||
// OK, if our saved area is null, allocate it here!
|
||||
if ( gVideoOverlays[uiCount].pSaveArea == NULL )
|
||||
{
|
||||
AllocateVideoOverlayArea( uiCount );
|
||||
}
|
||||
|
||||
if ( gVideoOverlays[uiCount].pSaveArea != NULL )
|
||||
if ( gVideoOverlays[uiCount].pSaveArea != NULL && gBackSaves[iBackIndex].sHeight > 0 && gBackSaves[iBackIndex].sWidth > 0)
|
||||
{
|
||||
iBackIndex = gVideoOverlays[uiCount].uiBackground;
|
||||
|
||||
// Save data from frame buffer!
|
||||
Blt16BPPTo16BPP((UINT16 *)gVideoOverlays[uiCount].pSaveArea, gBackSaves[ iBackIndex ].sWidth*2,
|
||||
(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
|
||||
0, 0,
|
||||
gBackSaves[ iBackIndex ].sLeft , gBackSaves[ iBackIndex ].sTop,
|
||||
gBackSaves[ iBackIndex ].sWidth, gBackSaves[ iBackIndex ].sHeight );
|
||||
// Save data from frame buffer!
|
||||
Blt16BPPTo16BPP(
|
||||
(UINT16 *)gVideoOverlays[uiCount].pSaveArea,
|
||||
gBackSaves[iBackIndex].sWidth * 2,
|
||||
(UINT16 *)pSrcBuf,
|
||||
uiSrcPitchBYTES,
|
||||
0,
|
||||
0,
|
||||
gBackSaves[iBackIndex].sLeft,
|
||||
gBackSaves[iBackIndex].sTop,
|
||||
gBackSaves[iBackIndex].sWidth,
|
||||
gBackSaves[iBackIndex].sHeight
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user