[Scummvm-cvs-logs] scummvm master -> 41e02baff162f8e9b910af22b371f838e16c8377

bluegr bluegr at gmail.com
Thu Apr 25 01:36:58 CEST 2013


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:
41e02baff1 SCI: Fix scaling in the back room of the bookstore in GK1


Commit: 41e02baff162f8e9b910af22b371f838e16c8377
    https://github.com/scummvm/scummvm/commit/41e02baff162f8e9b910af22b371f838e16c8377
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-24T16:36:03-07:00

Commit Message:
SCI: Fix scaling in the back room of the bookstore in GK1

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 5f65762..bf1ce6d 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -747,7 +747,8 @@ void GfxFrameout::kernelFrameout() {
 					// TODO: We can only process symmetrical scaling for now (i.e. same value for scaleX/scaleY)
 					if ((itemEntry->scaleSignal & kScaleSignalDoScaling32) && 
 					   !(itemEntry->scaleSignal & kScaleSignalDisableGlobalScaling32) &&
-					    (itemEntry->scaleX == itemEntry->scaleY))
+					    (itemEntry->scaleX == itemEntry->scaleY) &&
+						itemEntry->scaleX != 128)
 						applyGlobalScaling(itemEntry, it->planeRect, view->getHeight(itemEntry->loopNo, itemEntry->celNo));
 
 					if ((itemEntry->scaleX == 128) && (itemEntry->scaleY == 128))






More information about the Scummvm-git-logs mailing list