[Scummvm-git-logs] scummvm master -> 9e70b0853bd79c07380f2e1975677ab85e208bf2

[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:
2f16dabe57 DIRECTOR: Lingo: Implemented 'the colorQD' and 'the colorDepth' entities
9e70b0853b DIRECTOR: Lingo: Fix 'the' entities processing


Commit: 2f16dabe5786d3873dc80377a8d2c79d7439dab7
    https://github.com/scummvm/scummvm/commit/2f16dabe5786d3873dc80377a8d2c79d7439dab7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-01T18:47:04+02:00

Commit Message:
DIRECTOR: Lingo: Implemented 'the colorQD' and 'the colorDepth' entities

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



diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 26b3387..d921e11 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -70,6 +70,8 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "install");
+
+	_colorDepth = 8;	// FIXME. Check if it is 8-bit
 }
 
 DirectorEngine::~DirectorEngine() {
diff --git a/engines/director/director.h b/engines/director/director.h
index f8207f4..d319f47 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -96,6 +96,9 @@ public:
 	Common::RandomSource _rnd;
 	Graphics::MacWindowManager *_wm;
 
+public:
+	int _colorDepth;
+
 protected:
 	virtual Common::Error run();
 
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 421336d..342e524 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -428,7 +428,7 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 					warning("Cast id %d not found", _sprites[i]->_castId);
 					continue;
 				} else {
-					warning("Getting cast id %d from shared cast");
+					warning("Getting cast id %d from shared cast", _sprites[i]->_castId);
 					cast = _vm->getSharedCasts()->getVal(_sprites[i]->_castId);
 				}
 			} else {
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 2bf6cfb..bef2e50 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -225,6 +225,10 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		_floatPrecisionFormat = Common::String::format("%%.%df", _floatPrecision);
 		warning("set to %d: %s", _floatPrecision, _floatPrecisionFormat.c_str());
 		break;
+	case kTheColorDepth:
+		_vm->_colorDepth = d.toInt();
+		warning("STUB: Set color depth to %d", _vm->_colorDepth);
+		break;
 	default:
 		warning("Unprocessed setting field %d of entity %d", field, entity);
 	}
@@ -361,6 +365,12 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.type = FLOAT;
 		d.u.f = sqrt(id.u.f);
 		break;
+	case kTheColorQD:
+		push(Datum(1));
+		break;
+	case kTheColorDepth:
+		push(Datum(_vm->_colorDepth));
+		break;
 	default:
 		warning("Unprocessed getting field %d of entity %d", field, entity);
 		d.type = VOID;


Commit: 9e70b0853bd79c07380f2e1975677ab85e208bf2
    https://github.com/scummvm/scummvm/commit/9e70b0853bd79c07380f2e1975677ab85e208bf2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-01T18:52:27+02:00

Commit Message:
DIRECTOR: Lingo: Fix 'the' entities processing

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 bef2e50..7fb0551 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -366,10 +366,12 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.u.f = sqrt(id.u.f);
 		break;
 	case kTheColorQD:
-		push(Datum(1));
+		d.type = INT;
+		d.u.i = 1;
 		break;
 	case kTheColorDepth:
-		push(Datum(_vm->_colorDepth));
+		d.type = INT;
+		d.u.i = _vm->_colorDepth;
 		break;
 	default:
 		warning("Unprocessed getting field %d of entity %d", field, entity);