From c8b98dd41cb395d56de15f447b28f6b8b3c3e2e3 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Thu, 11 Oct 2018 10:18:48 +0100 Subject: AGI: Clamp Graphics Blit into Screen Area. 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. --- engines/agi/graphics.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'engines/agi') diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp index 119ccfea1d..d08e9bb99a 100644 --- a/engines/agi/graphics.cpp +++ b/engines/agi/graphics.cpp @@ -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(width, 0, _displayScreenWidth); + height = CLIP(height, 0, _displayScreenHeight); + x = CLIP(x, 0, _displayScreenWidth-width); + y = CLIP(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) { -- cgit v1.2.3