From 03e3f2c68cef429983787ddd38e74718db1ee8d1 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Thu, 18 Feb 2016 00:07:28 -0600 Subject: SCI: Fix some rect off-by-ones --- engines/sci/graphics/plane32.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/sci/graphics/plane32.cpp') diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp index 297c6e3d21..33c01cf828 100644 --- a/engines/sci/graphics/plane32.cpp +++ b/engines/sci/graphics/plane32.cpp @@ -78,8 +78,8 @@ _moved(0) { _gameRect.left = readSelectorValue(segMan, object, SELECTOR(inLeft)); _gameRect.top = readSelectorValue(segMan, object, SELECTOR(inTop)); - _gameRect.right = readSelectorValue(segMan, object, SELECTOR(inRight)); - _gameRect.bottom = readSelectorValue(segMan, object, SELECTOR(inBottom)); + _gameRect.right = readSelectorValue(segMan, object, SELECTOR(inRight)) + 1; + _gameRect.bottom = readSelectorValue(segMan, object, SELECTOR(inBottom)) + 1; convertGameRectToPlaneRect(); _back = readSelectorValue(segMan, object, SELECTOR(back)); @@ -136,7 +136,7 @@ void Plane::convertGameRectToPlaneRect() { const Ratio ratioY = Ratio(screenHeight, scriptHeight); _planeRect = _gameRect; - mulru(_planeRect, ratioX, ratioY, 1); + mulru(_planeRect, ratioX, ratioY); } void Plane::printDebugInfo(Console *con) const { @@ -752,8 +752,8 @@ void Plane::update(const reg_t object) { _vanishingPoint.y = readSelectorValue(segMan, object, SELECTOR(vanishingY)); _gameRect.left = readSelectorValue(segMan, object, SELECTOR(inLeft)); _gameRect.top = readSelectorValue(segMan, object, SELECTOR(inTop)); - _gameRect.right = readSelectorValue(segMan, object, SELECTOR(inRight)); - _gameRect.bottom = readSelectorValue(segMan, object, SELECTOR(inBottom)); + _gameRect.right = readSelectorValue(segMan, object, SELECTOR(inRight)) + 1; + _gameRect.bottom = readSelectorValue(segMan, object, SELECTOR(inBottom)) + 1; convertGameRectToPlaneRect(); _priority = readSelectorValue(segMan, object, SELECTOR(priority)); -- cgit v1.2.3