[Scummvm-cvs-logs] scummvm master -> faf52df0653006ad8107e91bb24bc747e4b01e29

[sev-]

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

Summary:
381e8fc51d WAGE: Fix think line drawing, as pointed by md5
faf52df065 DIRECTOR: Fix horizontal coordinate calculation in 1bpp uncompressed


Commit: 381e8fc51d34ebcb02566b608c201dbe96aad1a0
    https://github.com/scummvm/scummvm/commit/381e8fc51d34ebcb02566b608c201dbe96aad1a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-24T23:23:47+02:00

Commit Message:
WAGE: Fix think line drawing, as pointed by md5

Changed paths:
    engines/wage/design.cpp



diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 86b325e..fd2a67b 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -235,9 +235,9 @@ void drawPixel(int x, int y, int color, void *data) {
 					color : kColorWhite;
 		}
 	} else {
-		int x1 = x;
+		int x1 = x - p->thickness / 2;
 		int x2 = x1 + p->thickness;
-		int y1 = y;
+		int y1 = y - p->thickness / 2;
 		int y2 = y1 + p->thickness;
 
 		for (y = y1; y < y2; y++)


Commit: faf52df0653006ad8107e91bb24bc747e4b01e29
    https://github.com/scummvm/scummvm/commit/faf52df0653006ad8107e91bb24bc747e4b01e29
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-24T23:24:07+02:00

Commit Message:
DIRECTOR: Fix horizontal coordinate calculation in 1bpp uncompressed

Changed paths:
    engines/director/images.cpp



diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index 2c2553f..b763603 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -142,8 +142,8 @@ bool BITDDecoder::loadStream(Common::SeekableReadStream &stream) {
 		for (y = 0; y < _surface->h; y++) {
 			for (x = 0; x < _surface->w; x++) {
 				byte color = stream.readByte();
-				for (int c = 0; c < 8; c++, x++)
-					*((byte *)_surface->getBasePtr(x, y)) = (color & (1 << (7 - c))) ? 0 : 0xff;
+				for (int c = 0; c < 8; c++)
+					*((byte *)_surface->getBasePtr(x++, y)) = (color & (1 << (7 - c))) ? 0 : 0xff;
 			}
 		}