[Scummvm-git-logs] scummvm master -> d20122d916e8fe18dc8855914b0e84c9f5343311

digitall 547637+digitall at users.noreply.github.com
Fri Sep 11 08:05:08 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:
d20122d916 PARALLACTION: Fix assert when starting The Big Red Adventure


Commit: d20122d916e8fe18dc8855914b0e84c9f5343311
    https://github.com/scummvm/scummvm/commit/d20122d916e8fe18dc8855914b0e84c9f5343311
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-09-11T09:05:05+01:00

Commit Message:
PARALLACTION: Fix assert when starting The Big Red Adventure

Changed paths:
    engines/parallaction/graphics.cpp


diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index b732141971..2797f6ad8c 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -856,8 +856,8 @@ void Gfx::setBackground(uint type, BackgroundInfo *info) {
 	_backgroundInfo->finalizePath();
 
 	if (_gameType == GType_BRA) {
-		int width = CLIP(info->width, (int)_vm->_screenWidth, info->width);
-		int height = CLIP(info->height, (int)_vm->_screenHeight, info->height);
+		int width = MAX(info->width, (int)_vm->_screenWidth);
+		int height = MAX(info->height, (int)_vm->_screenHeight);
 
 		if (width != _backBuffer.w || height != _backBuffer.h) {
 			_backBuffer.create(width, height, Graphics::PixelFormat::createFormatCLUT8());




More information about the Scummvm-git-logs mailing list