[Scummvm-git-logs] scummvm master -> 3207187e8240294f6200b620477b593a7adb3206

[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:
c879fd4d54 DIRECTOR: Added puppet flag to Sprite
3207187e82 DIRECTOR: LINGO: Implementing setting the puppet of sprite


Commit: c879fd4d540bcfac35cf7f569e3819fcbb764f33
    https://github.com/scummvm/scummvm/commit/c879fd4d540bcfac35cf7f569e3819fcbb764f33
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-14T23:43:03+02:00

Commit Message:
DIRECTOR: Added puppet flag to Sprite

Changed paths:
    engines/director/sprite.cpp
    engines/director/sprite.h


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index af40871292..3511a031cc 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -36,6 +36,7 @@ Sprite::Sprite() {
 	_castId = 0;
 	_constraint = 0;
 	_moveable = false;
+	_puppet = false;
 	_editable = false;
 	_castId = 0;
 	_castIndex = 0;
diff --git a/engines/director/sprite.h b/engines/director/sprite.h
index 791c509d26..fd6eba929a 100644
--- a/engines/director/sprite.h
+++ b/engines/director/sprite.h
@@ -90,6 +90,7 @@ public:
 	byte _constraint;
 	bool _moveable;
 	bool _editable;
+	bool _puppet;
 	byte _backColor;
 	byte _foreColor;
 


Commit: 3207187e8240294f6200b620477b593a7adb3206
    https://github.com/scummvm/scummvm/commit/3207187e8240294f6200b620477b593a7adb3206
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-14T23:43:03+02:00

Commit Message:
DIRECTOR: LINGO: Implementing setting the puppet of sprite

Changed paths:
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 6af48ba6e3..f6f1d0e0d6 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -567,6 +567,9 @@ Datum Lingo::getTheSprite(Datum &id1, int field) {
 	case kThePattern:
 		d.u.i = sprite->getPattern();
 		break;
+	case kThePuppet:
+		d.u.i = sprite->_puppet;
+		break;
 	case kTheRight:
 		d.u.i = sprite->_right;
 		break;
@@ -684,6 +687,9 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
 	case kThePattern:
 		sprite->setPattern(d.u.i);
 		break;
+	case kThePuppet:
+		sprite->_puppet = d.u.i;
+		break;
 	case kTheRight:
 		sprite->_right = d.u.i;
 		break;