1 files changed, 29 insertions, 16 deletions

diff --git a/engines/sci/graphics/helpers.h b/engines/sci/graphics/helpers.h
index fbad120374..1da3749c90 100644
--- a/engines/sci/graphics/helpers.h
+++ b/engines/sci/graphics/helpers.h
@@ -40,8 +40,10 @@ namespace Sci {
 #define MAX_CACHED_FONTS 20
 #define MAX_CACHED_VIEWS 50
 
-#define SCI_SHAKE_DIRECTION_VERTICAL 1
-#define SCI_SHAKE_DIRECTION_HORIZONTAL 2
+enum ShakeDirection {
+	kShakeVertical   = 1,
+	kShakeHorizontal = 2
+};
 
 typedef int GuiResourceId; // is a resource-number and -1 means no parameter given
 
@@ -139,16 +141,28 @@ inline void mul(Common::Rect &rect, const Common::Rational &ratioX, const Common
 }
 
 /**
+ * Multiplies a rectangle by two ratios with default
+ * rounding. Modifies the rect directly. Uses inclusive
+ * rectangle rounding.
+ */
+inline void mulinc(Common::Rect &rect, const Common::Rational &ratioX, const Common::Rational &ratioY) {
+	rect.left = (rect.left * ratioX).toInt();
+	rect.top = (rect.top * ratioY).toInt();
+	rect.right = ((rect.right - 1) * ratioX).toInt() + 1;
+	rect.bottom = ((rect.bottom - 1) * ratioY).toInt() + 1;
+}
+
+/**
  * Multiplies a number by a rational number, rounding up to
  * the nearest whole number.
  */
-inline int mulru(const int value, const Common::Rational &ratio) {
-	int num = value * ratio.getNumerator();
+inline int mulru(const int value, const Common::Rational &ratio, const int extra = 0) {
+	int num = (value + extra) * ratio.getNumerator();
 	int result = num / ratio.getDenominator();
 	if (num > ratio.getDenominator() && num % ratio.getDenominator()) {
 		++result;
 	}
-	return result;
+	return result - extra;
 }
 
 /**
@@ -165,19 +179,12 @@ inline void mulru(Common::Point &point, const Common::Rational &ratioX, const Co
  * Multiplies a point by two rational numbers for X and Y,
  * rounding up to the nearest whole number. Modifies the
  * rect directly.
- *
- * @note In SCI engine, the bottom-right corner of rects
- * received an additional one pixel during the
- * multiplication in order to round up to include the
- * bottom-right corner. Since ScummVM rects do not include
- * the bottom-right corner, doing this ends up making rects
- * a pixel too wide/tall depending upon the remainder.
  */
-inline void mulru(Common::Rect &rect, const Common::Rational &ratioX, const Common::Rational &ratioY) {
+inline void mulru(Common::Rect &rect, const Common::Rational &ratioX, const Common::Rational &ratioY, const int extra) {
 	rect.left = mulru(rect.left, ratioX);
 	rect.top = mulru(rect.top, ratioY);
-	rect.right = mulru(rect.right, ratioX);
-	rect.bottom = mulru(rect.bottom, ratioY);
+	rect.right = mulru(rect.right - 1, ratioX, extra) + 1;
+	rect.bottom = mulru(rect.bottom - 1, ratioY, extra) + 1;
 }
 
 struct Buffer : public Graphics::Surface {
@@ -186,6 +193,12 @@ struct Buffer : public Graphics::Surface {
 	uint16 scriptWidth;
 	uint16 scriptHeight;
 
+	Buffer() :
+		screenWidth(0),
+		screenHeight(0),
+		scriptWidth(320),
+		scriptHeight(200) {}
+
 	Buffer(const uint16 width, const uint16 height, uint8 *const pix) :
 		screenWidth(width),
 		screenHeight(height),
@@ -226,7 +239,7 @@ struct Color {
 		return used == other.used && r == other.r && g == other.g && b == other.b;
 	}
 	inline bool operator!=(const Color &other) const {
-		return !(*this == other);
+		return !operator==(other);
 	}
 #endif
 };