[Scummvm-git-logs] scummvm master -> 49cfa190df7825cb18b4985866b903ef9d01dcfd

[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:
35c18c3811 FULLPIPE: Clarify field data type in PicAniInfo
49cfa190df FULLPIPE: Fix GameObject::setPicAniInfo(). Now all animations get restored correctly.


Commit: 35c18c3811dbb714e39419ca432acf8fdc6d55e3
    https://github.com/scummvm/scummvm/commit/35c18c3811dbb714e39419ca432acf8fdc6d55e3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T01:16:30+02:00

Commit Message:
FULLPIPE: Clarify field data type in PicAniInfo

Changed paths:
    engines/fullpipe/objects.h



diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index f9a641d..c9da439 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -44,7 +44,7 @@ class GameProject : public CObject {
 };
 
 struct PicAniInfo {
-	int32 type;
+	uint32 type;
 	int16 objectId;
 	int16 field_6;
 	int32 field_8;


Commit: 49cfa190df7825cb18b4985866b903ef9d01dcfd
    https://github.com/scummvm/scummvm/commit/49cfa190df7825cb18b4985866b903ef9d01dcfd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T01:16:45+02:00

Commit Message:
FULLPIPE: Fix GameObject::setPicAniInfo(). Now all animations get restored correctly.

Changed paths:
    engines/fullpipe/gfx.cpp



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index eba5d44..59c2e41 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -398,18 +398,23 @@ bool GameObject::setPicAniInfo(PicAniInfo *picAniInfo) {
 		return false;
 	}
 
-	if (picAniInfo->type & 3) {
+	if (picAniInfo->type & 2) {
 		setOXY(picAniInfo->ox, picAniInfo->oy);
 		_priority = picAniInfo->priority;
 		_okeyCode = picAniInfo->field_8;
 		setFlags(picAniInfo->flags);
 		_field_8 = picAniInfo->field_24;
+
+		return true;
 	}
 
 	if (picAniInfo->type & 1) {
 		StaticANIObject *ani = (StaticANIObject *)this;
 
 		ani->_messageQueueId = (picAniInfo->type >> 16) & 0xffff;
+		ani->_okeyCode = picAniInfo->field_8;
+		ani->setFlags(picAniInfo->flags);
+		ani->_field_8 = picAniInfo->field_24;
 
 		if (picAniInfo->staticsId) {
 			ani->_statics = ani->getStaticsById(picAniInfo->staticsId);
@@ -425,10 +430,15 @@ bool GameObject::setPicAniInfo(PicAniInfo *picAniInfo) {
 			ani->_movement = 0;
 		}
 
+		ani->setOXY(picAniInfo->ox, picAniInfo->oy);
+		ani->_priority = picAniInfo->priority;
+
 		ani->setSomeDynamicPhaseIndex(picAniInfo->someDynamicPhaseIndex);
+
+		return true;
 	}
 
-	return true;
+	return false;
 }
 
 Picture::Picture() {