[Scummvm-git-logs] scummvm master -> 28265496a1dbe42a4c724623e47b7c5b6215b13c

dreammaster paulfgilbert at gmail.com
Sun May 10 19:22:37 UTC 2020


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
28265496a1 ULTIMA4: Remove problematic assert


Commit: 28265496a1dbe42a4c724623e47b7c5b6215b13c
    https://github.com/scummvm/scummvm/commit/28265496a1dbe42a4c724623e47b7c5b6215b13c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-10T12:22:07-07:00

Commit Message:
ULTIMA4: Remove problematic assert

Changed paths:
    engines/ultima/ultima4/gfx/image.cpp


diff --git a/engines/ultima/ultima4/gfx/image.cpp b/engines/ultima/ultima4/gfx/image.cpp
index 577f153cf5..2cc6924939 100644
--- a/engines/ultima/ultima4/gfx/image.cpp
+++ b/engines/ultima/ultima4/gfx/image.cpp
@@ -435,8 +435,6 @@ void Image::drawSubRectOn(Image *d, int x, int y, int rx, int ry, int rw, int rh
 
 	if (rw > _surface->w || rh > _surface->h) {
 		// Blitting entire surface with stretching
-		assert(rx == 0 && ry == 0);
-
 		destSurface->transBlitFrom(*_surface,
 			Common::Rect(0, 0, _surface->w, _surface->h),
 			Common::Rect(x, y, x + rw, y + rh),




More information about the Scummvm-git-logs mailing list