[Scummvm-git-logs] scummvm master -> 76926d0d3a888c3bca92508000bbbdb9c693711f

[dreammaster]

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:
76926d0d3a AGS: Fix rendering crash in La Croix Pan


Commit: 76926d0d3a888c3bca92508000bbbdb9c693711f
    https://github.com/scummvm/scummvm/commit/76926d0d3a888c3bca92508000bbbdb9c693711f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-06-24T22:48:55-07:00

Commit Message:
AGS: Fix rendering crash in La Croix Pan

Changed paths:
    engines/ags/engine/gfx/ali_3d_scummvm.cpp


diff --git a/engines/ags/engine/gfx/ali_3d_scummvm.cpp b/engines/ags/engine/gfx/ali_3d_scummvm.cpp
index 17edbce59a..5bdd5c8db4 100644
--- a/engines/ags/engine/gfx/ali_3d_scummvm.cpp
+++ b/engines/ags/engine/gfx/ali_3d_scummvm.cpp
@@ -254,18 +254,9 @@ IDriverDependantBitmap *ScummVMRendererGraphicsDriver::CreateDDBFromBitmap(Bitma
 }
 
 void ScummVMRendererGraphicsDriver::UpdateDDBFromBitmap(IDriverDependantBitmap *bitmapToUpdate, Bitmap *bitmap, bool hasAlpha) {
-	ALSoftwareBitmap *target = (ALSoftwareBitmap *)bitmapToUpdate;
-	if (target->GetWidth() != bitmap->GetWidth() || target->GetHeight() != bitmap->GetHeight())
-		error("UpdateDDBFromBitmap: mismatched bitmap size");
-	const int color_depth = bitmap->GetColorDepth();
-	if (color_depth != target->GetColorDepth())
-		error("UpdateDDBFromBitmap: mismatched colour depths");
-
-	if (color_depth == 8) {
-		select_palette(_G(palette));
-
-		unselect_palette();
-	}
+	ALSoftwareBitmap *alSwBmp = (ALSoftwareBitmap *)bitmapToUpdate;
+	alSwBmp->_bmp = bitmap;
+	alSwBmp->_hasAlpha = hasAlpha;
 }
 
 void ScummVMRendererGraphicsDriver::DestroyDDB(IDriverDependantBitmap *bitmap) {