[Scummvm-git-logs] scummvm master -> 216566f235d459b9e997d47211b1329b39959f44

[sev-]

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

Summary:
2a1651991a FULLPIPE: Added detection for English Steam version
9d9c856479 FULLPIPE: Map code difference for German version
216566f235 FULLPIPE: Renames in ModalMap


Commit: 2a1651991a83aedf91937970c6fcfbbdceecfbda
    https://github.com/scummvm/scummvm/commit/2a1651991a83aedf91937970c6fcfbbdceecfbda
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-06T19:46:13+01:00

Commit Message:
FULLPIPE: Added detection for English Steam version

Changed paths:
    engines/fullpipe/detection.cpp


diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index e85e75e..e42de65 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -79,6 +79,17 @@ static const ADGameDescription gameDescriptions[] = {
 		GUIO1(GUIO_NONE)
 	},
 
+	// Full Pipe English version
+	{
+		"fullpipe",
+		0,
+		AD_ENTRY1s("4620.sc2", "bffea807345fece14089768fc141af83", 510),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_DROPPLATFORM,
+		GUIO1(GUIO_NONE)
+	},
+
 	// Full Pipe Russian Demo version
 	{
 		"fullpipe",


Commit: 9d9c8564795fef5ed5bb1d0dc4b4ec1110114794
    https://github.com/scummvm/scummvm/commit/9d9c8564795fef5ed5bb1d0dc4b4ec1110114794
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-06T19:46:13+01:00

Commit Message:
FULLPIPE: Map code difference for German version

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h


diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 6b77f59..eb6debe 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -104,6 +104,7 @@ namespace Fullpipe {
 #define PIC_MAP_A14 5276
 #define PIC_MAP_I01 5295
 #define PIC_MAP_I02 5296
+#define PIC_MAP_I03 5395
 #define PIC_MAP_P01 5277
 #define PIC_MAP_P02 5278
 #define PIC_MAP_P03 5279
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 49e9be6..0cbc8d8 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -272,7 +272,8 @@ void ModalVideoPlayer::play(const char *filename) {
 
 ModalMap::ModalMap() {
 	_mapScene = 0;
-	_pic = 0;
+	_pic = NULL;
+	_picI03 = NULL;
 	_isRunning = false;
 	_rect1 = g_fp->_sceneRect;
 	_x = g_fp->_currentScene->_x;
@@ -421,6 +422,18 @@ void ModalMap::initMap() {
 		_pic->_flags |= 4;
 	}
 
+	_picI03 = _mapScene->getPictureObjectById(PIC_MAP_I03, 0);
+
+	if (_picI03) {
+		_picI03->_flags &= 0xFFFB;
+	} else {
+		warning("No PIC_MAP_I03");
+	}
+
+	g_system->warpMouse(400, 300);
+	g_fp->_mouseScreenPos.x = 400;
+	g_fp->_mouseScreenPos.y = 300;
+
 	g_fp->setArcadeOverlay(PIC_CSR_MAP);
 }
 
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 349fc3b..951d38d 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -93,6 +93,7 @@ public:
 class ModalMap : public BaseModalObject {
 	Scene *_mapScene;
 	PictureObject *_pic;
+	PictureObject *_picI03;
 	bool _isRunning;
 	Common::Rect _rect1;
 	int _x;


Commit: 216566f235d459b9e997d47211b1329b39959f44
    https://github.com/scummvm/scummvm/commit/216566f235d459b9e997d47211b1329b39959f44
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-06T19:46:31+01:00

Commit Message:
FULLPIPE: Renames in ModalMap

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h


diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 0cbc8d8..d1bda9d 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -281,9 +281,9 @@ ModalMap::ModalMap() {
 	_flag = 0;
 	_mouseX = 0;
 	_mouseY = 0;
-	_field_38 = 0;
-	_field_3C = 0;
-	_field_40 = 12;
+	_dragX = 0;
+	_dragY = 0;
+	_hotSpotDelay = 12;
 	_rect2.top = 0;
 	_rect2.left = 0;
 	_rect2.bottom = 600;
@@ -303,8 +303,8 @@ bool ModalMap::init(int counterdiff) {
 	g_fp->setCursor(PIC_CSR_ITN);
 
 	if (_flag) {
-		_rect2.left = _mouseX + _field_38 - g_fp->_mouseScreenPos.x;
-		_rect2.top = _mouseY + _field_3C - g_fp->_mouseScreenPos.y;
+		_rect2.left = _mouseX + _dragX - g_fp->_mouseScreenPos.x;
+		_rect2.top = _mouseY + _dragY - g_fp->_mouseScreenPos.y;
 		_rect2.right = _rect2.left + 800;
 		_rect2.bottom = _rect2.top + 600;
 
@@ -315,10 +315,10 @@ bool ModalMap::init(int counterdiff) {
 		_rect2 = g_fp->_sceneRect;
 	}
 
-	_field_40--;
+	_hotSpotDelay--;
 
-	if (_field_40 <= 0) {
-		_field_40 = 12;
+	if (_hotSpotDelay <= 0) {
+		_hotSpotDelay = 12;
 
 		if (_pic)
 			_pic->_flags ^= 4;
@@ -345,8 +345,8 @@ bool ModalMap::handleMessage(ExCommand *cmd) {
 		_mouseX = g_fp->_mouseScreenPos.x;
 		_mouseY = g_fp->_mouseScreenPos.y;
 
-		_field_38 = _rect2.left;
-		_field_3C = _rect2.top;
+		_dragX = _rect2.left;
+		_dragY = _rect2.top;
 
 		return false;
 
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 951d38d..a8d8a81 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -101,9 +101,9 @@ class ModalMap : public BaseModalObject {
 	int _flag;
 	int _mouseX;
 	int _mouseY;
-	int _field_38;
-	int _field_3C;
-	int _field_40;
+	int _dragX;
+	int _dragY;
+	int _hotSpotDelay;
 	Common::Rect _rect2;
 
  public: