[Scummvm-git-logs] scummvm master -> 044ea6f8b028e24e49760702716d4498f70acab9

[yinsimei]

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:
044ea6f8b0 SLUDGE: Apply lightmap to sprites


Commit: 044ea6f8b028e24e49760702716d4498f70acab9
    https://github.com/scummvm/scummvm/commit/044ea6f8b028e24e49760702716d4498f70acab9
Author: Simei Yin (roseline.yin at gmail.com)
Date: 2017-08-12T11:20:48+02:00

Commit Message:
SLUDGE: Apply lightmap to sprites

Changed paths:
    engines/sludge/sprites.cpp


diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index 644d87d..fc9622e 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -386,14 +386,14 @@ bool GraphicsManager::scaleSprite(Sprite &single, const SpritePalette &fontPal,
 			_curLight[0] = _curLight[1] = _curLight[2] = 255;
 			ptr = blitted = new Graphics::Surface();
 			blitted->copyFrom(single.surface);
-//			Graphics::TransparentSurface tmp(_lightMap, false);
-//			Common::Rect rect_none(x1, y1, x1 + diffX, y1 + diffY);
-//			Common::Rect rect_h(_sceneWidth - x1 - diffX, y1, _sceneWidth - x1, y1 + diffY);
-//			tmp.blit(*blitted, 0, 0,
-//					(mirror ? Graphics::FLIP_H : Graphics::FLIP_NONE),
-//					(mirror ? &rect_h : &rect_none),
-//					TS_ARGB(255, 255, 255, 255),
-//					blitted->w, blitted->h, Graphics::BLEND_MULTIPLY);
+			Graphics::TransparentSurface tmp(_lightMap, false);
+			Common::Rect rect_none(x1, y1, x1 + diffX, y1 + diffY);
+			Common::Rect rect_h(_sceneWidth - x1 - diffX, y1, _sceneWidth - x1, y1 + diffY);
+			tmp.blit(*blitted, 0, 0,
+					(mirror ? Graphics::FLIP_H : Graphics::FLIP_NONE),
+					(mirror ? &rect_h : &rect_none),
+					TS_ARGB(255, 255, 255, 255),
+					blitted->w, blitted->h, Graphics::BLEND_MULTIPLY);
 		}
 	} else {
 		_curLight[0] = _curLight[1] = _curLight[2] = 255;
@@ -526,14 +526,14 @@ void GraphicsManager::fixScaleSprite(int x, int y, Sprite &single, const SpriteP
 			_curLight[0] = _curLight[1] = _curLight[2] = 255;
 			ptr = blitted = new Graphics::Surface();
 			blitted->copyFrom(single.surface);
-//			Graphics::TransparentSurface tmp(_lightMap, false);
-//			Common::Rect rect_none(x1, y1, x1 + diffX, y1 + diffY);
-//			Common::Rect rect_h(_sceneWidth - x1 - diffX, y1, _sceneWidth - x1, y1 + diffY);
-//			tmp.blit(*blitted, 0, 0,
-//					(mirror ? Graphics::FLIP_H : Graphics::FLIP_NONE),
-//					(mirror ? &rect_h : &rect_none),
-//					TS_ARGB(255, 255, 255, 255),
-//					blitted->w, blitted->h, Graphics::BLEND_MULTIPLY);
+			Graphics::TransparentSurface tmp(_lightMap, false);
+			Common::Rect rect_none(x1, y1, x1 + diffX, y1 + diffY);
+			Common::Rect rect_h(_sceneWidth - x1 - diffX, y1, _sceneWidth - x1, y1 + diffY);
+			tmp.blit(*blitted, 0, 0,
+					(mirror ? Graphics::FLIP_H : Graphics::FLIP_NONE),
+					(mirror ? &rect_h : &rect_none),
+					TS_ARGB(255, 255, 255, 255),
+					blitted->w, blitted->h, Graphics::BLEND_MULTIPLY);
 		}
 	} else {
 		_curLight[0] = _curLight[1] = _curLight[2] = 255;