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

[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:
59c11d842f FULLPIPE: Change data type in Movement member
b6944479d3 FULLPIPE: Started scene04 implementation


Commit: 59c11d842f03ae769bb58c9a864d211adbee6ce1
    https://github.com/scummvm/scummvm/commit/59c11d842f03ae769bb58c9a864d211adbee6ce1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-20T17:07:00-08:00

Commit Message:
FULLPIPE: Change data type in Movement member

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



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 445259c..c86d5ab 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1162,8 +1162,8 @@ Movement::Movement() {
 	_counter = 0;
 	_counterMax = 83;
 
-	_field_24 = 0;
-	_field_28 = 0;
+	_somePoint.x = 0;
+	_somePoint.y = 0;
 }
 
 Movement::Movement(Movement *src, StaticANIObject *ani) {
@@ -1185,8 +1185,8 @@ Movement::Movement(Movement *src, StaticANIObject *ani) {
 	_currDynamicPhaseIndex = src->_currDynamicPhaseIndex;
 	_field_94 = 0;
 
-	_field_24 = 0;
-	_field_28 = 0;
+	_somePoint.x = 0;
+	_somePoint.y = 0;
 
 	_currMovement = src;
 	_ox = src->_ox;
@@ -1219,8 +1219,8 @@ Movement::Movement(Movement *src, int *oldIdxs, int newSize, StaticANIObject *an
 	_currDynamicPhaseIndex = 0;
 	_field_94 = 0;
 
-	_field_24 = 0;
-	_field_28 = 0;
+	_somePoint.x = 0;
+	_somePoint.y = 0;
 
 	_field_50 = src->_field_50;
 	_flipFlag = src->_flipFlag;
diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h
index 49ebc8e..15de4ab 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/fullpipe/statics.h
@@ -107,8 +107,7 @@ class StaticANIObject;
 
 class Movement : public GameObject {
   public:
-	int _field_24;
-	int _field_28;
+	Common::Point _somePoint;
 	int _lastFrameSpecialFlag;
 	int _flipFlag;
 	int _updateFlag1;


Commit: b6944479d3f18689d59357cd293ee232f81263cf
    https://github.com/scummvm/scummvm/commit/b6944479d3f18689d59357cd293ee232f81263cf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-20T17:07:00-08:00

Commit Message:
FULLPIPE: Started scene04 implementation

Changed paths:
    engines/fullpipe/module.mk



diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 0a7e195..88e3ac5 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -26,6 +26,7 @@ MODULE_OBJS = \
 	scenes/scene01.o \
 	scenes/scene02.o \
 	scenes/scene03.o \
+	scenes/scene04.o \
 	scenes/sceneDbg.o \
 	scenes/sceneIntro.o