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

[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:
02f0692a62 FULLPIPE: Use proper Surface coordinates
b4f418a4f3 FULLPIPE: Fix wrong member name in InteractionController::handleInteraction


Commit: 02f0692a62ab721703581fdb8f0d29051090faba
    https://github.com/scummvm/scummvm/commit/02f0692a62ab721703581fdb8f0d29051090faba
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-13T16:10:24+02:00

Commit Message:
FULLPIPE: Use proper Surface coordinates

Changed paths:
    engines/fullpipe/gfx.cpp



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index dcd5c33..dd8d8b2 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -806,7 +806,7 @@ bool Bitmap::isPixelHitAtPos(int x, int y) {
 	if (!_surface)
 		return false;
 
-	return ((*((int32 *)_surface->getBasePtr(x, y)) & 0xff000000) != 0);
+	return ((*((int32 *)_surface->getBasePtr(x - _x, y - _y)) & 0xff000000) != 0);
 }
 
 void Bitmap::decode(int32 *palette) {


Commit: b4f418a4f36c76c2f1759a01f9af228edd371f48
    https://github.com/scummvm/scummvm/commit/b4f418a4f36c76c2f1759a01f9af228edd371f48
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-13T16:10:24+02:00

Commit Message:
FULLPIPE: Fix wrong member name in InteractionController::handleInteraction

Changed paths:
    engines/fullpipe/interaction.cpp



diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 484b1e1..78920ed 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -305,7 +305,7 @@ LABEL_38:
 			ani->changeStatics2(inter->_staticsId1);
 		}
 
-		int xpos = inter->_yOffs + obj->_ox;
+		int xpos = inter->_xOffs + obj->_ox;
 		int ypos = inter->_yOffs + obj->_oy;
 
 		obj->setPicAniInfo(&aniInfo);