libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 20:51:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

AGI: Clamp Graphics Blit into Screen Area.

Browse Source 
Some games, especially fangames appear to blit to co-ordinates outside
the screen area, which caused an assertion in the graphics backend.

To prevent this and allow further debugging in these cases, we clamp
this to the screen area. Note that there are several other locations
which do backend graphics calls, so this may need to be applied
elsewhere in the general case.

This fixes bug Trac #10736.
This commit is contained in:
D G Turner 2018-10-11 10:18:48 +01:00
parent c5db13d5e0
commit c8b98dd41c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/agi/graphics.cpp
View File

@ -316,6 +316,13 @@ uint32 GfxMgr::getDisplayOffsetToVisualScreenPos(int16 x, int16 y) {
// Attention: uses display screen coordinates!
void GfxMgr::copyDisplayRectToScreen(int16 x, int16 y, int16 width, int16 height) {
// Clamp to sane values to prevent off screen blits causing exceptions in backend
// FIXME: Add warnings / debug of clamping?
width = CLIP<int16>(width, 0, _displayScreenWidth);
height = CLIP<int16>(height, 0, _displayScreenHeight);
x = CLIP<int16>(x, 0, _displayScreenWidth-width);
y = CLIP<int16>(y, 0, _displayScreenHeight-height);
g_system->copyRectToScreen(_displayScreen + y * _displayScreenWidth + x, _displayScreenWidth, x, y, width, height);
}
void GfxMgr::copyDisplayRectToScreen(int16 x, int16 adjX, int16 y, int16 adjY, int16 width, int16 adjWidth, int16 height, int16 adjHeight) {