[Scummvm-git-logs] scummvm master -> 06ca6531aee42ee0e7b98b16e9969f392e678a9a

[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:
4162295464 DIRECTOR: Lingo: Implemented getting 'the frame' entity
06ca6531ae DIRECTOR: Fix movie scanning


Commit: 416229546432a54210441568a8a07a75b28b4862
    https://github.com/scummvm/scummvm/commit/416229546432a54210441568a8a07a75b28b4862
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-19T21:47:44+02:00

Commit Message:
DIRECTOR: Lingo: Implemented getting 'the frame' entity

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



diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 13471fd..a8633f1 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -427,6 +427,10 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.type = INT;
 		d.u.i = _vm->_machineType;
 		break;
+	case kTheFrame:
+		d.type = INT;
+		d.u.i = _vm->getCurrentScore()->getCurrentFrame();
+		break;
 	default:
 		warning("Unprocessed getting field %d of entity %d", field, entity);
 		d.type = VOID;
diff --git a/engines/director/score.h b/engines/director/score.h
index b5c66d1..83f2528 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -188,6 +188,7 @@ public:
 	void loadConfig(Common::SeekableSubReadStreamEndian &stream);
 	void loadCastData(Common::SeekableSubReadStreamEndian &stream);
 	void setCurrentFrame(uint16 frameId) { _currentFrame = frameId; }
+	int getCurrentFrame() { return _currentFrame; }
 	Common::String getMacName() const { return _macName; }
 	Sprite *getSpriteById(uint16 id);
 


Commit: 06ca6531aee42ee0e7b98b16e9969f392e678a9a
    https://github.com/scummvm/scummvm/commit/06ca6531aee42ee0e7b98b16e9969f392e678a9a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-19T21:53:18+02:00

Commit Message:
DIRECTOR: Fix movie scanning

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



diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 43c5602..5d64695 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -120,7 +120,7 @@ Common::Error DirectorEngine::run() {
 
 	//testFont();
 
-	scanMovies(ConfMan.get("path"));
+	_movies = scanMovies(ConfMan.get("path"));
 
 	loadSharedCastsFrom(_sharedCastFile);
 	loadMainArchive();
@@ -134,7 +134,7 @@ Common::Error DirectorEngine::run() {
 	return Common::kNoError;
 }
 
-Common::HashMap<Common::String, Score *> DirectorEngine::scanMovies(const Common::String &folder) {
+Common::HashMap<Common::String, Score *> *DirectorEngine::scanMovies(const Common::String &folder) {
 	Common::FSNode directory(folder);
 	Common::FSList movies;
 	const char *sharedMMMname;
@@ -145,7 +145,7 @@ Common::HashMap<Common::String, Score *> DirectorEngine::scanMovies(const Common
 		sharedMMMname = "Shared Cast*";
 
 
-	Common::HashMap<Common::String, Score *> nameMap;
+	Common::HashMap<Common::String, Score *> *nameMap = new Common::HashMap<Common::String, Score *>();
 	if (!directory.getChildren(movies, Common::FSNode::kListFilesOnly))
 		return nameMap;
 
@@ -162,7 +162,7 @@ Common::HashMap<Common::String, Score *> DirectorEngine::scanMovies(const Common
 
 			arc->openFile(i->getName());
 			Score *sc = new Score(this, arc);
-			nameMap[sc->getMacName()] = sc;
+			nameMap->setVal(sc->getMacName(), sc);
 
 			debugC(2, kDebugLoading, "Movie name: \"%s\"", sc->getMacName().c_str());
 		}
diff --git a/engines/director/director.h b/engines/director/director.h
index f64b87b..300998b 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -109,7 +109,7 @@ protected:
 private:
 	const DirectorGameDescription *_gameDescription;
 
-	Common::HashMap<Common::String, Score *> scanMovies(const Common::String &folder);
+	Common::HashMap<Common::String, Score *> *scanMovies(const Common::String &folder);
 	void loadEXE();
 	void loadEXEv3(Common::SeekableReadStream *stream);
 	void loadEXEv4(Common::SeekableReadStream *stream);